bugfixes, refactoring
[picodrive.git] / platform / gp2x / emu.c
index 9615013..0375a7f 100644 (file)
 #include "menu.h"\r
 #include "../common/arm_utils.h"\r
 #include "../common/fonts.h"\r
+#include "../common/emu.h"\r
+#include "../common/config.h"\r
 #include "cpuctrl.h"\r
 \r
 #include <Pico/PicoInt.h>\r
 #include <Pico/Patch.h>\r
+#include <Pico/sound/mix.h>\r
 #include <zlib/zlib.h>\r
 \r
 //#define PFRAMES\r
 \r
 int engineState;\r
 int select_exits = 0;\r
-char *PicoConfigFile = "picoconfig.bin";\r
-currentConfig_t currentConfig;\r
 \r
 char romFileName[PATH_MAX];\r
-unsigned char *rom_data = NULL;\r
 \r
 extern int crashed_940;\r
 \r
-static short sndBuffer[2*44100/50];\r
-static char noticeMsg[64];                                     // notice msg to draw\r
+static short __attribute__((aligned(4))) sndBuffer[2*44100/50];\r
 static struct timeval noticeMsgTime = { 0, 0 };        // when started showing\r
 static int osd_fps_x;\r
-static int combo_keys = 0, combo_acts = 0;     // keys and actions which need button combos\r
 static int gp2x_old_gamma = 100;\r
-static unsigned char *movie_data = NULL;\r
-static int movie_size = 0;\r
+char noticeMsg[64];                    // notice msg to draw\r
 unsigned char *PicoDraw2FB = NULL;  // temporary buffer for alt renderer\r
-int state_slot = 0;\r
 int reset_timing = 0;\r
-int config_slot = 0, config_slot_current = 0;\r
 \r
+static void emu_msg_cb(const char *msg);\r
+static void emu_msg_tray_open(void);\r
 \r
-// utilities\r
-static void strlwr(char* string)\r
-{\r
-       while ( (*string++ = (char)tolower(*string)) );\r
-}\r
-\r
-static int try_rfn_cut(void)\r
-{\r
-       FILE *tmp;\r
-       char *p;\r
-\r
-       p = romFileName + strlen(romFileName) - 1;\r
-       for (; p > romFileName; p--)\r
-               if (*p == '.') break;\r
-       *p = 0;\r
-\r
-       if((tmp = fopen(romFileName, "rb"))) {\r
-               fclose(tmp);\r
-               return 1;\r
-       }\r
-       return 0;\r
-}\r
-\r
-static void get_ext(char *file, char *ext)\r
-{\r
-       char *p;\r
-\r
-       p = file + strlen(file) - 4;\r
-       if (p < file) p = file;\r
-       strncpy(ext, p, 4);\r
-       ext[4] = 0;\r
-       strlwr(ext);\r
-}\r
-\r
-char *biosfiles_us[] = { "us_scd2_9306", "SegaCDBIOS9303", "us_scd1_9210" };\r
-char *biosfiles_eu[] = { "eu_mcd2_9306", "eu_mcd2_9303",   "eu_mcd1_9210" };\r
-char *biosfiles_jp[] = { "jp_mcd1_9112", "jp_mcd1_9111" };\r
-\r
-extern char **g_argv;\r
 \r
-int find_bios(int region, char **bios_file)\r
+void emu_noticeMsgUpdated(void)\r
 {\r
-       static char bios_path[1024];\r
-       int i, j, count;\r
-       char **files;\r
-       FILE *f = NULL;\r
-\r
-       if (region == 4) { // US\r
-               files = biosfiles_us;\r
-               count = sizeof(biosfiles_us) / sizeof(char *);\r
-       } else if (region == 8) { // EU\r
-               files = biosfiles_eu;\r
-               count = sizeof(biosfiles_eu) / sizeof(char *);\r
-       } else if (region == 1 || region == 2) {\r
-               files = biosfiles_jp;\r
-               count = sizeof(biosfiles_jp) / sizeof(char *);\r
-       } else {\r
-               return 0;\r
-       }\r
-\r
-       for (i = 0; i < count; i++)\r
-       {\r
-               strncpy(bios_path, g_argv[0], 1023);\r
-               bios_path[1024-32] = 0;\r
-               for (j = strlen(bios_path); j > 0; j--)\r
-                       if (bios_path[j] == '/') { bios_path[j+1] = 0; break; }\r
-               strcat(bios_path, files[i]);\r
-               strcat(bios_path, ".bin");\r
-               f = fopen(bios_path, "rb");\r
-               if (f) break;\r
-\r
-               bios_path[strlen(bios_path) - 4] = 0;\r
-               strcat(bios_path, ".zip");\r
-               f = fopen(bios_path, "rb");\r
-               if (f) break;\r
-       }\r
-\r
-       if (f) {\r
-               printf("using bios: %s\n", bios_path);\r
-               fclose(f);\r
-               if (bios_file) *bios_file = bios_path;\r
-               return 1;\r
-       } else {\r
-               sprintf(menuErrorMsg, "no %s BIOS files found, read docs",\r
-                       region != 4 ? (region == 8 ? "EU" : "JAP") : "USA");\r
-               printf("%s\n", menuErrorMsg);\r
-               return 0;\r
-       }\r
+       gettimeofday(&noticeMsgTime, 0);\r
 }\r
 \r
-/* checks if romFileName points to valid MegaCD image\r
- * if so, checks for suitable BIOS */\r
-int emu_cd_check(int *pregion)\r
+void emu_getMainDir(char *dst, int len)\r
 {\r
-       unsigned char buf[32];\r
-       pm_file *cd_f;\r
-       int type = 0, region = 4; // 1: Japan, 4: US, 8: Europe\r
-\r
-       cd_f = pm_open(romFileName);\r
-       if (!cd_f) return 0; // let the upper level handle this\r
+       extern char **g_argv;\r
+       int j;\r
 \r
-       if (pm_read(buf, 32, cd_f) != 32) {\r
-               pm_close(cd_f);\r
-               return 0;\r
-       }\r
-\r
-       if (!strncasecmp("SEGADISCSYSTEM", (char *)buf+0x00, 14)) type = 1;       // Sega CD (ISO)\r
-       if (!strncasecmp("SEGADISCSYSTEM", (char *)buf+0x10, 14)) type = 2;       // Sega CD (BIN)\r
-       if (type == 0) {\r
-               pm_close(cd_f);\r
-               return 0;\r
-       }\r
-\r
-       /* it seems we have a CD image here. Try to detect region now.. */\r
-       pm_seek(cd_f, (type == 1) ? 0x100+0x10B : 0x110+0x10B, SEEK_SET);\r
-       pm_read(buf, 1, cd_f);\r
-       pm_close(cd_f);\r
-\r
-       if (buf[0] == 0x64) region = 8; // EU\r
-       if (buf[0] == 0xa1) region = 1; // JAP\r
-\r
-       printf("detected %s Sega/Mega CD image with %s region\n",\r
-               type == 2 ? "BIN" : "ISO", region != 4 ? (region == 8 ? "EU" : "JAP") : "USA");\r
-\r
-       if (pregion != NULL) *pregion = region;\r
-\r
-       return type;\r
+       strncpy(dst, g_argv[0], len);\r
+       len -= 32; // reserve\r
+       if (len < 0) len = 0;\r
+       dst[len] = 0;\r
+       for (j = strlen(dst); j > 0; j--)\r
+               if (dst[j] == '/') { dst[j+1] = 0; break; }\r
 }\r
 \r
-int emu_ReloadRom(void)\r
-{\r
-       unsigned int rom_size = 0;\r
-       char *used_rom_name = romFileName;\r
-       char ext[5];\r
-       pm_file *rom;\r
-       int ret, cd_state, cd_region, cfg_loaded = 0;\r
-\r
-       printf("emu_ReloadRom(%s)\n", romFileName);\r
-\r
-       get_ext(romFileName, ext);\r
-\r
-       // detect wrong extensions\r
-       if(!strcmp(ext, ".srm") || !strcmp(ext, "s.gz") || !strcmp(ext, ".mds")) { // s.gz ~ .mds.gz\r
-               sprintf(menuErrorMsg, "Not a ROM selected.");\r
-               return 0;\r
-       }\r
-\r
-       PicoPatchUnload();\r
-\r
-       // check for movie file\r
-       if(movie_data) {\r
-               free(movie_data);\r
-               movie_data = 0;\r
-       }\r
-       if(!strcmp(ext, ".gmv")) {\r
-               // check for both gmv and rom\r
-               int dummy;\r
-               FILE *movie_file = fopen(romFileName, "rb");\r
-               if(!movie_file) {\r
-                       sprintf(menuErrorMsg, "Failed to open movie.");\r
-                       return 0;\r
-               }\r
-               fseek(movie_file, 0, SEEK_END);\r
-               movie_size = ftell(movie_file);\r
-               fseek(movie_file, 0, SEEK_SET);\r
-               if(movie_size < 64+3) {\r
-                       sprintf(menuErrorMsg, "Invalid GMV file.");\r
-                       fclose(movie_file);\r
-                       return 0;\r
-               }\r
-               movie_data = malloc(movie_size);\r
-               if(movie_data == NULL) {\r
-                       sprintf(menuErrorMsg, "low memory.");\r
-                       fclose(movie_file);\r
-                       return 0;\r
-               }\r
-               fread(movie_data, 1, movie_size, movie_file);\r
-               fclose(movie_file);\r
-               if (strncmp((char *)movie_data, "Gens Movie TEST", 15) != 0) {\r
-                       sprintf(menuErrorMsg, "Invalid GMV file.");\r
-                       return 0;\r
-               }\r
-               dummy = try_rfn_cut() || try_rfn_cut();\r
-               if (!dummy) {\r
-                       sprintf(menuErrorMsg, "Could't find a ROM for movie.");\r
-                       return 0;\r
-               }\r
-               get_ext(romFileName, ext);\r
-       }\r
-       else if (!strcmp(ext, ".pat")) {\r
-               int dummy;\r
-               PicoPatchLoad(romFileName);\r
-               dummy = try_rfn_cut() || try_rfn_cut();\r
-               if (!dummy) {\r
-                       sprintf(menuErrorMsg, "Could't find a ROM to patch.");\r
-                       return 0;\r
-               }\r
-               get_ext(romFileName, ext);\r
-       }\r
-\r
-       if ((PicoMCD & 1) && Pico_mcd != NULL)\r
-               Stop_CD();\r
-\r
-       // check for MegaCD image\r
-       cd_state = emu_cd_check(&cd_region);\r
-       if (cd_state > 0)\r
-       {\r
-               // valid CD image, check for BIOS..\r
-\r
-               // we need to have config loaded at this point\r
-               ret = emu_ReadConfig(1, 1);\r
-               if (!ret) emu_ReadConfig(0, 1);\r
-               cfg_loaded = 1;\r
-\r
-               if (PicoRegionOverride) {\r
-                       cd_region = PicoRegionOverride;\r
-                       printf("overrided region to %s\n", cd_region != 4 ? (cd_region == 8 ? "EU" : "JAP") : "USA");\r
-               }\r
-               if (!find_bios(cd_region, &used_rom_name)) {\r
-                       // bios_help() ?\r
-                       return 0;\r
-               }\r
-\r
-               PicoMCD |= 1;\r
-               get_ext(used_rom_name, ext);\r
-       }\r
-       else\r
-       {\r
-               if (PicoMCD & 1) Stop_CD();\r
-               PicoMCD &= ~1;\r
-       }\r
-\r
-       rom = pm_open(used_rom_name);\r
-       if(!rom) {\r
-               sprintf(menuErrorMsg, "Failed to open rom.");\r
-               return 0;\r
-       }\r
-\r
-       menu_romload_prepare(used_rom_name);\r
-\r
-       if(rom_data) {\r
-               free(rom_data);\r
-               rom_data = 0;\r
-               rom_size = 0;\r
-       }\r
-\r
-       if( (ret = PicoCartLoad(rom, &rom_data, &rom_size)) ) {\r
-               sprintf(menuErrorMsg, "PicoCartLoad() failed.");\r
-               printf("%s\n", menuErrorMsg);\r
-               pm_close(rom);\r
-               menu_romload_end();\r
-               return 0;\r
-       }\r
-       pm_close(rom);\r
-       menu_romload_end();\r
-\r
-       // detect wrong files (Pico crashes on very small files), also see if ROM EP is good\r
-       if(rom_size <= 0x200 || strncmp((char *)rom_data, "Pico", 4) == 0 ||\r
-         ((*(unsigned char *)(rom_data+4)<<16)|(*(unsigned short *)(rom_data+6))) >= (int)rom_size) {\r
-               if (rom_data) free(rom_data);\r
-               rom_data = 0;\r
-               sprintf(menuErrorMsg, "Not a ROM selected.");\r
-               return 0;\r
-       }\r
-\r
-       // load config for this ROM (do this before insert to get correct region)\r
-       if (!cfg_loaded) {\r
-               ret = emu_ReadConfig(1, 1);\r
-               if (!ret) emu_ReadConfig(0, 1);\r
-       }\r
-\r
-       printf("PicoCartInsert(%p, %d);\n", rom_data, rom_size);\r
-       if(PicoCartInsert(rom_data, rom_size)) {\r
-               sprintf(menuErrorMsg, "Failed to load ROM.");\r
-               return 0;\r
-       }\r
-\r
-       Pico.m.frame_count = 0;\r
-\r
-       // insert CD if it was detected\r
-       if (cd_state > 0) {\r
-               ret = Insert_CD(romFileName, cd_state == 2);\r
-               if (ret != 0) {\r
-                       sprintf(menuErrorMsg, "Insert_CD() failed, invalid CD image?");\r
-                       printf("%s\n", menuErrorMsg);\r
-                       return 0;\r
-               }\r
-       }\r
-\r
-       // emu_ReadConfig() might have messed currentConfig.lastRomFile\r
-       strncpy(currentConfig.lastRomFile, romFileName, sizeof(currentConfig.lastRomFile)-1);\r
-       currentConfig.lastRomFile[sizeof(currentConfig.lastRomFile)-1] = 0;\r
-\r
-       if (PicoPatches) {\r
-               PicoPatchPrepare();\r
-               PicoPatchApply();\r
-       }\r
-\r
-       // additional movie stuff\r
-       if (movie_data) {\r
-               if(movie_data[0x14] == '6')\r
-                    PicoOpt |=  0x20; // 6 button pad\r
-               else PicoOpt &= ~0x20;\r
-               PicoOpt |= 0x10040; // accurate timing, no VDP fifo timing\r
-               if(movie_data[0xF] >= 'A') {\r
-                       if(movie_data[0x16] & 0x80) {\r
-                               PicoRegionOverride = 8;\r
-                       } else {\r
-                               PicoRegionOverride = 4;\r
-                       }\r
-                       PicoReset(0);\r
-                       // TODO: bits 6 & 5\r
-               }\r
-               movie_data[0x18+30] = 0;\r
-               sprintf(noticeMsg, "MOVIE: %s", (char *) &movie_data[0x18]);\r
-       }\r
-       else\r
-       {\r
-               PicoOpt &= ~0x10000;\r
-               if(Pico.m.pal) {\r
-                       strcpy(noticeMsg, "PAL SYSTEM / 50 FPS");\r
-               } else {\r
-                       strcpy(noticeMsg, "NTSC SYSTEM / 60 FPS");\r
-               }\r
-       }\r
-       gettimeofday(&noticeMsgTime, 0);\r
-\r
-       // load SRAM for this ROM\r
-       if(currentConfig.EmuOpt & 1)\r
-               emu_SaveLoadGame(1, 1);\r
-\r
-       return 1;\r
-}\r
-\r
-\r
-static void emu_msg_cb(const char *msg);\r
-static void emu_msg_tray_open(void);\r
-\r
 void emu_Init(void)\r
 {\r
        // make temp buffer for alt renderer\r
@@ -419,56 +97,7 @@ void emu_Init(void)
 }\r
 \r
 \r
-static void romfname_ext(char *dst, const char *prefix, const char *ext)\r
-{\r
-       char *p;\r
-       int prefix_len = 0;\r
-\r
-       // make save filename\r
-       for (p = romFileName+strlen(romFileName)-1; p >= romFileName && *p != '/'; p--); p++;\r
-       *dst = 0;\r
-       if (prefix) {\r
-               strcpy(dst, prefix);\r
-               prefix_len = strlen(prefix);\r
-       }\r
-       strncpy(dst + prefix_len, p, 511-prefix_len);\r
-       dst[511-8] = 0;\r
-       if (dst[strlen(dst)-4] == '.') dst[strlen(dst)-4] = 0;\r
-       if (ext) strcat(dst, ext);\r
-}\r
-\r
-\r
-static void find_combos(void)\r
-{\r
-       int act, u;\r
-\r
-       // find out which keys and actions are combos\r
-       combo_keys = combo_acts = 0;\r
-       for (act = 0; act < 32; act++)\r
-       {\r
-               int keyc = 0;\r
-               if (act == 16) continue; // player2 flag\r
-               for (u = 0; u < 32; u++)\r
-               {\r
-                       if (currentConfig.KeyBinds[u] & (1 << act)) keyc++;\r
-               }\r
-               if (keyc > 1)\r
-               {\r
-                       // loop again and mark those keys and actions as combo\r
-                       for (u = 0; u < 32; u++)\r
-                       {\r
-                               if (currentConfig.KeyBinds[u] & (1 << act)) {\r
-                                       combo_keys |= 1 << u;\r
-                                       combo_acts |= 1 << act;\r
-                               }\r
-                       }\r
-               }\r
-       }\r
-       // printf("combo keys/acts: %08x %08x\n", combo_keys, combo_acts);\r
-}\r
-\r
-\r
-void scaling_update(void)\r
+static void scaling_update(void)\r
 {\r
        PicoOpt &= ~0x4100;\r
        switch (currentConfig.scaling) {\r
@@ -480,138 +109,6 @@ void scaling_update(void)
 }\r
 \r
 \r
-int emu_ReadConfig(int game, int no_defaults)\r
-{\r
-       FILE *f;\r
-       char cfg[512], extbuf[16];\r
-       int bread = 0;\r
-\r
-       if (!game)\r
-       {\r
-               if (!no_defaults)\r
-               {\r
-                       // set default config\r
-                       memset(&currentConfig, 0, sizeof(currentConfig));\r
-                       currentConfig.lastRomFile[0] = 0;\r
-                       currentConfig.EmuOpt  = 0x1f | 0x600; // | confirm_save, cd_leds\r
-                       currentConfig.PicoOpt = 0x0f | 0xe00; // | use_940, cd_pcm, cd_cdda\r
-                       currentConfig.PsndRate = 22050; // 44100;\r
-                       currentConfig.PicoRegion = 0; // auto\r
-                       currentConfig.PicoAutoRgnOrder = 0x184; // US, EU, JP\r
-                       currentConfig.Frameskip = -1; // auto\r
-                       currentConfig.CPUclock = 200;\r
-                       currentConfig.volume = 50;\r
-                       currentConfig.KeyBinds[ 0] = 1<<0; // SACB RLDU\r
-                       currentConfig.KeyBinds[ 4] = 1<<1;\r
-                       currentConfig.KeyBinds[ 2] = 1<<2;\r
-                       currentConfig.KeyBinds[ 6] = 1<<3;\r
-                       currentConfig.KeyBinds[14] = 1<<4;\r
-                       currentConfig.KeyBinds[13] = 1<<5;\r
-                       currentConfig.KeyBinds[12] = 1<<6;\r
-                       currentConfig.KeyBinds[ 8] = 1<<7;\r
-                       currentConfig.KeyBinds[15] = 1<<26; // switch rend\r
-                       currentConfig.KeyBinds[10] = 1<<27; // save state\r
-                       currentConfig.KeyBinds[11] = 1<<28; // load state\r
-                       currentConfig.KeyBinds[23] = 1<<29; // vol up\r
-                       currentConfig.KeyBinds[22] = 1<<30; // vol down\r
-                       currentConfig.gamma = 100;\r
-                       currentConfig.PicoCDBuffers = 64;\r
-                       currentConfig.scaling = 0;\r
-               }\r
-               strncpy(cfg, PicoConfigFile, 511);\r
-               if (config_slot != 0)\r
-               {\r
-                       char *p = strrchr(cfg, '.');\r
-                       if (p == NULL) p = cfg + strlen(cfg);\r
-                       sprintf(extbuf, ".%i.pbcfg", config_slot);\r
-                       strncpy(p, extbuf, 511 - (p - cfg));\r
-               }\r
-               cfg[511] = 0;\r
-       } else {\r
-               if (config_slot != 0)\r
-                    sprintf(extbuf, ".%i.pbcfg", config_slot);\r
-               else strcpy(extbuf, ".pbcfg");\r
-               romfname_ext(cfg, "cfg/", extbuf);\r
-               f = fopen(cfg, "rb");\r
-               if (!f) romfname_ext(cfg, NULL, ".pbcfg");\r
-               else fclose(f);\r
-       }\r
-\r
-       printf("emu_ReadConfig: %s ", cfg);\r
-       f = fopen(cfg, "rb");\r
-       if (f) {\r
-               bread = fread(&currentConfig, 1, sizeof(currentConfig), f);\r
-               fclose(f);\r
-       }\r
-       printf(bread > 0 ? "(ok)\n" : "(failed)\n");\r
-\r
-       PicoOpt = currentConfig.PicoOpt;\r
-       PsndRate = currentConfig.PsndRate;\r
-       PicoRegionOverride = currentConfig.PicoRegion;\r
-       PicoAutoRgnOrder = currentConfig.PicoAutoRgnOrder;\r
-       PicoCDBuffers = currentConfig.PicoCDBuffers;\r
-       scaling_update();\r
-       // some sanity checks\r
-       if (currentConfig.CPUclock < 10 || currentConfig.CPUclock > 4096) currentConfig.CPUclock = 200;\r
-       if (currentConfig.gamma < 10 || currentConfig.gamma > 300) currentConfig.gamma = 100;\r
-       if (currentConfig.volume < 0 || currentConfig.volume > 99) currentConfig.volume = 50;\r
-       // if volume keys are unbound, bind them to volume control\r
-       if (!currentConfig.KeyBinds[23] && !currentConfig.KeyBinds[22]) {\r
-               currentConfig.KeyBinds[23] = 1<<29; // vol up\r
-               currentConfig.KeyBinds[22] = 1<<30; // vol down\r
-       }\r
-\r
-       if (bread > 0) config_slot_current = config_slot;\r
-       return (bread > 0); // == sizeof(currentConfig));\r
-}\r
-\r
-\r
-int emu_WriteConfig(int game)\r
-{\r
-       FILE *f;\r
-       char cfg[512], extbuf[16];\r
-       int bwrite = 0;\r
-\r
-       if (!game)\r
-       {\r
-               strncpy(cfg, PicoConfigFile, 511);\r
-               if (config_slot != 0)\r
-               {\r
-                       char *p = strrchr(cfg, '.');\r
-                       if (p == NULL) p = cfg + strlen(cfg);\r
-                       sprintf(extbuf, ".%i.pbcfg", config_slot);\r
-                       strncpy(p, extbuf, 511 - (p - cfg));\r
-               }\r
-               cfg[511] = 0;\r
-       } else {\r
-               if (config_slot != 0)\r
-                    sprintf(extbuf, ".%i.pbcfg", config_slot);\r
-               else strcpy(extbuf, ".pbcfg");\r
-               romfname_ext(cfg, "cfg/", extbuf);\r
-       }\r
-\r
-       printf("emu_WriteConfig: %s ", cfg);\r
-       f = fopen(cfg, "wb");\r
-       if (f) {\r
-               currentConfig.PicoOpt = PicoOpt;\r
-               currentConfig.PsndRate = PsndRate;\r
-               currentConfig.PicoRegion = PicoRegionOverride;\r
-               currentConfig.PicoAutoRgnOrder = PicoAutoRgnOrder;\r
-               currentConfig.PicoCDBuffers = PicoCDBuffers;\r
-               bwrite = fwrite(&currentConfig, 1, sizeof(currentConfig), f);\r
-               fflush(f);\r
-               fclose(f);\r
-#ifndef NO_SYNC\r
-               sync();\r
-#endif\r
-       }\r
-       printf((bwrite == sizeof(currentConfig)) ? "(ok)\n" : "(failed)\n");\r
-\r
-       if (bwrite == sizeof(currentConfig)) config_slot_current = config_slot;\r
-       return (bwrite == sizeof(currentConfig));\r
-}\r
-\r
-\r
 void emu_Deinit(void)\r
 {\r
        // save SRAM\r
@@ -621,20 +118,10 @@ void emu_Deinit(void)
        }\r
 \r
        if (!(currentConfig.EmuOpt & 0x20)) {\r
-               FILE *f = fopen(PicoConfigFile, "r+b");\r
-               if (!f) emu_WriteConfig(0);\r
-               else {\r
-                       // if we already have config, reload it, except last ROM\r
-                       fseek(f, sizeof(currentConfig.lastRomFile), SEEK_SET);\r
-                       fread(&currentConfig.EmuOpt, 1, sizeof(currentConfig) - sizeof(currentConfig.lastRomFile), f);\r
-                       fseek(f, 0, SEEK_SET);\r
-                       fwrite(&currentConfig, 1, sizeof(currentConfig), f);\r
-                       fflush(f);\r
-                       fclose(f);\r
+               config_writelrom(PicoConfigFile);\r
 #ifndef NO_SYNC\r
-                       sync();\r
+               sync();\r
 #endif\r
-               }\r
        }\r
 \r
        free(PicoDraw2FB);\r
@@ -646,54 +133,45 @@ void emu_Deinit(void)
                set_gamma(100, 0);\r
 }\r
 \r
-static void text_out8_builtin(int x, int y, const char *text)\r
-{\r
-       int i,l,len=strlen(text);\r
-       unsigned char *screen = (unsigned char *)gp2x_screen + x + y*320;\r
-\r
-       /* always using built-in font */\r
-       for (i = 0; i < len; i++)\r
-       {\r
-               for (l=0;l<8;l++)\r
-               {\r
-                       unsigned char fd = fontdata8x8[((text[i])*8)+l];\r
-                       if (fd&0x80) screen[l*320+0]=0xf0;\r
-                       if (fd&0x40) screen[l*320+1]=0xf0;\r
-                       if (fd&0x20) screen[l*320+2]=0xf0;\r
-                       if (fd&0x10) screen[l*320+3]=0xf0;\r
-                       if (fd&0x08) screen[l*320+4]=0xf0;\r
-                       if (fd&0x04) screen[l*320+5]=0xf0;\r
-                       if (fd&0x02) screen[l*320+6]=0xf0;\r
-                       if (fd&0x01) screen[l*320+7]=0xf0;\r
-               }\r
-               screen += 8;\r
-       }\r
-}\r
-\r
-static void text_out16_builtin(int x, int y, const char *text)\r
-{\r
-       int i,l,len=strlen(text);\r
-       unsigned short *screen = (unsigned short *)gp2x_screen + x + y*320;\r
-\r
-       for (i = 0; i < len; i++)\r
-       {\r
-               for (l=0;l<8;l++)\r
-               {\r
-                       unsigned char fd = fontdata8x8[((text[i])*8)+l];\r
-                       if(fd&0x80) screen[l*320+0]=0xffff;\r
-                       if(fd&0x40) screen[l*320+1]=0xffff;\r
-                       if(fd&0x20) screen[l*320+2]=0xffff;\r
-                       if(fd&0x10) screen[l*320+3]=0xffff;\r
-                       if(fd&0x08) screen[l*320+4]=0xffff;\r
-                       if(fd&0x04) screen[l*320+5]=0xffff;\r
-                       if(fd&0x02) screen[l*320+6]=0xffff;\r
-                       if(fd&0x01) screen[l*320+7]=0xffff;\r
-               }\r
-               screen += 8;\r
-       }\r
+void emu_prepareDefaultConfig(void)\r
+{\r
+       memset(&defaultConfig, 0, sizeof(defaultConfig));\r
+       defaultConfig.EmuOpt    = 0x1d | 0x00700; // | <- ram_tmng, confirm_save, cd_leds\r
+       defaultConfig.s_PicoOpt = 0x0f | 0x20e00; // | <- use_940, cd_pcm, cd_cdda, svp drc\r
+       defaultConfig.s_PsndRate = 44100;\r
+       defaultConfig.s_PicoRegion = 0; // auto\r
+       defaultConfig.s_PicoAutoRgnOrder = 0x184; // US, EU, JP\r
+       defaultConfig.s_PicoCDBuffers = 64;\r
+       defaultConfig.Frameskip = -1; // auto\r
+       defaultConfig.CPUclock = 200;\r
+       defaultConfig.volume = 50;\r
+       defaultConfig.KeyBinds[ 0] = 1<<0; // SACB RLDU\r
+       defaultConfig.KeyBinds[ 4] = 1<<1;\r
+       defaultConfig.KeyBinds[ 2] = 1<<2;\r
+       defaultConfig.KeyBinds[ 6] = 1<<3;\r
+       defaultConfig.KeyBinds[14] = 1<<4;\r
+       defaultConfig.KeyBinds[13] = 1<<5;\r
+       defaultConfig.KeyBinds[12] = 1<<6;\r
+       defaultConfig.KeyBinds[ 8] = 1<<7;\r
+       defaultConfig.KeyBinds[15] = 1<<26; // switch rend\r
+       defaultConfig.KeyBinds[10] = 1<<27; // save state\r
+       defaultConfig.KeyBinds[11] = 1<<28; // load state\r
+       defaultConfig.KeyBinds[23] = 1<<29; // vol up\r
+       defaultConfig.KeyBinds[22] = 1<<30; // vol down\r
+       defaultConfig.gamma = 100;\r
+       defaultConfig.scaling = 0;\r
+}\r
+\r
+void emu_setDefaultConfig(void)\r
+{\r
+       memcpy(&currentConfig, &defaultConfig, sizeof(currentConfig));\r
+       PicoOpt = currentConfig.s_PicoOpt;\r
+       PsndRate = currentConfig.s_PsndRate;\r
+       PicoRegionOverride = currentConfig.s_PicoRegion;\r
+       PicoAutoRgnOrder = currentConfig.s_PicoAutoRgnOrder;\r
+       PicoCDBuffers = currentConfig.s_PicoCDBuffers;\r
 }\r
 \r
-\r
 void osd_text(int x, int y, const char *text)\r
 {\r
        int len = strlen(text)*8;\r
@@ -706,7 +184,7 @@ void osd_text(int x, int y, const char *text)
                        p = (int *) ((unsigned char *) gp2x_screen+x+320*(y+h));\r
                        for (i = len; i; i--, p++) *p = 0xe0e0e0e0;\r
                }\r
-               text_out8_builtin(x, y, text);\r
+               emu_textOut8(x, y, text);\r
        } else {\r
                int *p, i, h;\r
                x &= ~1; // align x\r
@@ -715,16 +193,15 @@ void osd_text(int x, int y, const char *text)
                        p = (int *) ((unsigned short *) gp2x_screen+x+320*(y+h));\r
                        for (i = len; i; i--, p++) *p = (*p>>2)&0x39e7;\r
                }\r
-               text_out16_builtin(x, y, text);\r
+               emu_textOut16(x, y, text);\r
        }\r
 }\r
 \r
 static void cd_leds(void)\r
 {\r
-       // mmu problems?\r
 //     static\r
        int old_reg;\r
-//     if (!((Pico_mcd->s68k_regs[0] ^ old_reg) & 3)) return; // no change\r
+//     if (!((Pico_mcd->s68k_regs[0] ^ old_reg) & 3)) return; // no change // mmu hack problems?\r
        old_reg = Pico_mcd->s68k_regs[0];\r
 \r
        if ((PicoOpt&0x10)||!(currentConfig.EmuOpt&0x80)) {\r
@@ -744,7 +221,7 @@ static void cd_leds(void)
                unsigned int col_r = (old_reg & 1) ? 0xc000c000 : 0;\r
                *p++ = col_g; *p++ = col_g; p+=2; *p++ = col_r; *p++ = col_r; p += 320/2 - 12/2;\r
                *p++ = col_g; *p++ = col_g; p+=2; *p++ = col_r; *p++ = col_r; p += 320/2 - 12/2;\r
-               *p++ = col_g; *p++ = col_g; p+=2; *p++ = col_r; *p++ = col_r; p += 320/2 - 12/2;\r
+               *p++ = col_g; *p++ = col_g; p+=2; *p++ = col_r; *p++ = col_r;\r
        }\r
 }\r
 \r
@@ -771,7 +248,8 @@ static void blit(const char *fps, const char *notice)
 {\r
        int emu_opt = currentConfig.EmuOpt;\r
 \r
-       if (PicoOpt&0x10) {\r
+       if (PicoOpt&0x10)\r
+       {\r
                // 8bit fast renderer\r
                if (Pico.m.dirtyPal) {\r
                        Pico.m.dirtyPal = 0;\r
@@ -779,8 +257,14 @@ static void blit(const char *fps, const char *notice)
                        // feed new palette to our device\r
                        gp2x_video_setpalette(localPal, 0x40);\r
                }\r
+               // a hack for VR\r
+               if (PicoRead16Hook == PicoSVPRead16)\r
+                       memset32((int *)(PicoDraw2FB+328*8+328*223), 0xe0e0e0e0, 328);\r
+               // do actual copy\r
                vidCpyM2((unsigned char *)gp2x_screen+320*8, PicoDraw2FB+328*8);\r
-       } else if (!(emu_opt&0x80)) {\r
+       }\r
+       else if (!(emu_opt&0x80))\r
+       {\r
                // 8bit accurate renderer\r
                if (Pico.m.dirtyPal) {\r
                        Pico.m.dirtyPal = 0;\r
@@ -913,11 +397,71 @@ static void emu_msg_tray_open(void)
        gettimeofday(&noticeMsgTime, 0);\r
 }\r
 \r
+static void update_volume(int has_changed, int is_up)\r
+{\r
+       static int prev_frame = 0, wait_frames = 0;\r
+       int vol = currentConfig.volume;\r
+\r
+       if (has_changed)\r
+       {\r
+               if (vol < 5 && (PicoOpt&8) && prev_frame == Pico.m.frame_count - 1 && wait_frames < 12)\r
+                       wait_frames++;\r
+               else {\r
+                       if (is_up) {\r
+                               if (vol < 99) vol++;\r
+                       } else {\r
+                               if (vol >  0) vol--;\r
+                       }\r
+                       wait_frames = 0;\r
+                       gp2x_sound_volume(vol, vol);\r
+                       currentConfig.volume = vol;\r
+               }\r
+               sprintf(noticeMsg, "VOL: %02i", vol);\r
+               gettimeofday(&noticeMsgTime, 0);\r
+               prev_frame = Pico.m.frame_count;\r
+       }\r
+\r
+       // set the right mixer func\r
+       if (!(PicoOpt&8)) return; // just use defaults for mono\r
+       if (vol >= 5)\r
+               PsndMix_32_to_16l = mix_32_to_16l_stereo;\r
+       else {\r
+               mix_32_to_16l_level = 5 - vol;\r
+               PsndMix_32_to_16l = mix_32_to_16l_stereo_lvl;\r
+       }\r
+}\r
+\r
+static void change_fast_forward(int set_on)\r
+{\r
+       static void *set_PsndOut = NULL;\r
+       static int set_Frameskip, set_EmuOpt, is_on = 0;\r
+\r
+       if (set_on && !is_on) {\r
+               set_PsndOut = PsndOut;\r
+               set_Frameskip = currentConfig.Frameskip;\r
+               set_EmuOpt = currentConfig.EmuOpt;\r
+               PsndOut = NULL;\r
+               currentConfig.Frameskip = 8;\r
+               currentConfig.EmuOpt &= ~4;\r
+               is_on = 1;\r
+       }\r
+       else if (!set_on && is_on) {\r
+               PsndOut = set_PsndOut;\r
+               currentConfig.Frameskip = set_Frameskip;\r
+               currentConfig.EmuOpt = set_EmuOpt;\r
+               PsndRerate(1);\r
+               update_volume(0, 0);\r
+               reset_timing = 1;\r
+               is_on = 0;\r
+       }\r
+}\r
+\r
 static void RunEvents(unsigned int which)\r
 {\r
-       if(which & 0x1800) { // save or load (but not both)\r
+       if (which & 0x1800) // save or load (but not both)\r
+       {\r
                int do_it = 1;\r
-               if ( emu_check_save_file(state_slot) &&\r
+               if ( emu_checkSaveFile(state_slot) &&\r
                                (( (which & 0x1000) && (currentConfig.EmuOpt & 0x800)) ||   // load\r
                                 (!(which & 0x1000) && (currentConfig.EmuOpt & 0x200))) ) { // save\r
                        unsigned long keys;\r
@@ -937,7 +481,8 @@ static void RunEvents(unsigned int which)
 \r
                reset_timing = 1;\r
        }\r
-       if(which & 0x0400) { // switch renderer\r
+       if (which & 0x0400) // switch renderer\r
+       {\r
                if      (  PicoOpt&0x10)             { PicoOpt&=~0x10; currentConfig.EmuOpt |= 0x80; }\r
                else if (!(currentConfig.EmuOpt&0x80)) PicoOpt|= 0x10;\r
                else   currentConfig.EmuOpt &= ~0x80;\r
@@ -954,7 +499,8 @@ static void RunEvents(unsigned int which)
 \r
                gettimeofday(&noticeMsgTime, 0);\r
        }\r
-       if(which & 0x0300) {\r
+       if (which & 0x0300)\r
+       {\r
                if(which&0x0200) {\r
                        state_slot -= 1;\r
                        if(state_slot < 0) state_slot = 9;\r
@@ -962,44 +508,15 @@ static void RunEvents(unsigned int which)
                        state_slot += 1;\r
                        if(state_slot > 9) state_slot = 0;\r
                }\r
-               sprintf(noticeMsg, "SAVE SLOT %i [%s]", state_slot, emu_check_save_file(state_slot) ? "USED" : "FREE");\r
+               sprintf(noticeMsg, "SAVE SLOT %i [%s]", state_slot, emu_checkSaveFile(state_slot) ? "USED" : "FREE");\r
                gettimeofday(&noticeMsgTime, 0);\r
        }\r
-       if(which & 0x0080) {\r
+       if (which & 0x0080) {\r
                engineState = PGS_Menu;\r
        }\r
 }\r
 \r
 \r
-static void updateMovie(void)\r
-{\r
-       int offs = Pico.m.frame_count*3 + 0x40;\r
-       if (offs+3 > movie_size) {\r
-               free(movie_data);\r
-               movie_data = 0;\r
-               strcpy(noticeMsg, "END OF MOVIE.");\r
-               printf("END OF MOVIE.\n");\r
-               gettimeofday(&noticeMsgTime, 0);\r
-       } else {\r
-               // MXYZ SACB RLDU\r
-               PicoPad[0] = ~movie_data[offs]   & 0x8f; // ! SCBA RLDU\r
-               if(!(movie_data[offs]   & 0x10)) PicoPad[0] |= 0x40; // A\r
-               if(!(movie_data[offs]   & 0x20)) PicoPad[0] |= 0x10; // B\r
-               if(!(movie_data[offs]   & 0x40)) PicoPad[0] |= 0x20; // A\r
-               PicoPad[1] = ~movie_data[offs+1] & 0x8f; // ! SCBA RLDU\r
-               if(!(movie_data[offs+1] & 0x10)) PicoPad[1] |= 0x40; // A\r
-               if(!(movie_data[offs+1] & 0x20)) PicoPad[1] |= 0x10; // B\r
-               if(!(movie_data[offs+1] & 0x40)) PicoPad[1] |= 0x20; // A\r
-               PicoPad[0] |= (~movie_data[offs+2] & 0x0A) << 8; // ! MZYX\r
-               if(!(movie_data[offs+2] & 0x01)) PicoPad[0] |= 0x0400; // X\r
-               if(!(movie_data[offs+2] & 0x04)) PicoPad[0] |= 0x0100; // Z\r
-               PicoPad[1] |= (~movie_data[offs+2] & 0xA0) << 4; // ! MZYX\r
-               if(!(movie_data[offs+2] & 0x10)) PicoPad[1] |= 0x0400; // X\r
-               if(!(movie_data[offs+2] & 0x40)) PicoPad[1] |= 0x0100; // Z\r
-       }\r
-}\r
-\r
-\r
 static void updateKeys(void)\r
 {\r
        unsigned long keys, allActions[2] = { 0, 0 }, events;\r
@@ -1017,23 +534,26 @@ static void updateKeys(void)
 \r
        for (i = 0; i < 32; i++)\r
        {\r
-               if (keys & (1 << i)) {\r
+               if (keys & (1 << i))\r
+               {\r
                        int pl, acts = currentConfig.KeyBinds[i];\r
                        if (!acts) continue;\r
                        pl = (acts >> 16) & 1;\r
-                       if (combo_keys & (1 << i)) {\r
-                               int u = i+1, acts_c = acts & combo_acts;\r
+                       if (kb_combo_keys & (1 << i))\r
+                       {\r
+                               int u, acts_c = acts & kb_combo_acts;\r
                                // let's try to find the other one\r
-                               if (acts_c)\r
-                                       for (; u < 32; u++)\r
-                                               if ( (currentConfig.KeyBinds[u] & acts_c) && (keys & (1 << u)) ) {\r
-                                                       allActions[pl] |= acts_c;\r
+                               if (acts_c) {\r
+                                       for (u = i + 1; u < 32; u++)\r
+                                               if ( (keys & (1 << u)) && (currentConfig.KeyBinds[u] & acts_c) ) {\r
+                                                       allActions[pl] |= acts_c & currentConfig.KeyBinds[u];\r
                                                        keys &= ~((1 << i) | (1 << u));\r
                                                        break;\r
                                                }\r
+                               }\r
                                // add non-combo actions if combo ones were not found\r
                                if (!acts_c || u == 32)\r
-                                       allActions[pl] |= acts & ~combo_acts;\r
+                                       allActions[pl] |= acts & ~kb_combo_acts;\r
                        } else {\r
                                allActions[pl] |= acts;\r
                        }\r
@@ -1062,22 +582,15 @@ static void updateKeys(void)
        events = (allActions[0] | allActions[1]) >> 16;\r
 \r
        // volume is treated in special way and triggered every frame\r
-       if(events & 0x6000) {\r
-               int vol = currentConfig.volume;\r
-               if (events & 0x2000) {\r
-                       if (vol < 99) vol++;\r
-               } else {\r
-                       if (vol >  0) vol--;\r
-               }\r
-               gp2x_sound_volume(vol, vol);\r
-               sprintf(noticeMsg, "VOL: %02i", vol);\r
-               gettimeofday(&noticeMsgTime, 0);\r
-               currentConfig.volume = vol;\r
-       }\r
+       if (events & 0x6000)\r
+               update_volume(1, events & 0x2000);\r
+\r
+       if ((events ^ prevEvents) & 0x40)\r
+               change_fast_forward(events & 0x40);\r
 \r
        events &= ~prevEvents;\r
        if (events) RunEvents(events);\r
-       if (movie_data) updateMovie();\r
+       if (movie_data) emu_updateMovie();\r
 \r
        prevEvents = (allActions[0] | allActions[1]) >> 16;\r
 }\r
@@ -1101,7 +614,7 @@ static void SkipFrame(int do_audio)
 }\r
 \r
 \r
-void emu_forced_frame(void)\r
+void emu_forcedFrame(void)\r
 {\r
        int po_old = PicoOpt;\r
        int eo_old = currentConfig.EmuOpt;\r
@@ -1151,7 +664,7 @@ static void simpleWait(int thissec, int lim_time)
 void emu_Loop(void)\r
 {\r
        static int gp2x_old_clock = 200;\r
-       static int PsndRate_old = 0, PicoOpt_old = 0, EmuOpt_old = 0, PsndLen_real = 0, pal_old = 0;\r
+       static int PsndRate_old = 0, PicoOpt_old = 0, EmuOpt_old = 0, pal_old = 0;\r
        char fpsbuff[24]; // fps count c string\r
        struct timeval tval; // timing\r
        int thissec = 0, frames_done = 0, frames_shown = 0, oldmodes = 0;\r
@@ -1184,9 +697,10 @@ void emu_Loop(void)
 \r
        // make sure we are in correct mode\r
        vidResetMode();\r
+       scaling_update();\r
        Pico.m.dirtyPal = 1;\r
        oldmodes = ((Pico.video.reg[12]&1)<<2) ^ 0xc;\r
-       find_combos();\r
+       emu_findKeyBindCombos();\r
 \r
        // pal/ntsc might have changed, reset related stuff\r
        target_fps = Pico.m.pal ? 50 : 60;\r
@@ -1194,16 +708,12 @@ void emu_Loop(void)
        reset_timing = 1;\r
 \r
        // prepare sound stuff\r
-       if(currentConfig.EmuOpt & 4) {\r
+       if (currentConfig.EmuOpt & 4)\r
+       {\r
                int snd_excess_add;\r
                if (PsndRate != PsndRate_old || (PicoOpt&0x20b) != (PicoOpt_old&0x20b) || Pico.m.pal != pal_old ||\r
                                ((PicoOpt&0x200) && crashed_940)) {\r
-                       /* if 940 is turned off, we need it to be put back to sleep */\r
-                       if (!(PicoOpt&0x200) && ((PicoOpt^PicoOpt_old)&0x200)) {\r
-                               Reset940(1, 2);\r
-                               Pause940(1);\r
-                       }\r
-                       sound_rerate(Pico.m.frame_count ? 1 : 0);\r
+                       PsndRerate(Pico.m.frame_count ? 1 : 0);\r
                }\r
                snd_excess_add = ((PsndRate - PsndLen*target_fps)<<16) / target_fps;\r
                printf("starting audio: %i len: %i (ex: %04x) stereo: %i, pal: %i\n",\r
@@ -1211,14 +721,14 @@ void emu_Loop(void)
                gp2x_start_sound(PsndRate, 16, (PicoOpt&8)>>3);\r
                gp2x_sound_volume(currentConfig.volume, currentConfig.volume);\r
                PicoWriteSound = updateSound;\r
+               update_volume(0, 0);\r
                memset(sndBuffer, 0, sizeof(sndBuffer));\r
                PsndOut = sndBuffer;\r
                PsndRate_old = PsndRate;\r
-               PsndLen_real = PsndLen;\r
                PicoOpt_old  = PicoOpt;\r
                pal_old = Pico.m.pal;\r
        } else {\r
-               PsndOut = 0;\r
+               PsndOut = NULL;\r
        }\r
 \r
        // prepare CD buffer\r
@@ -1243,14 +753,15 @@ void emu_Loop(void)
                int modes;\r
 \r
                gettimeofday(&tval, 0);\r
-               if(reset_timing) {\r
+               if (reset_timing) {\r
                        reset_timing = 0;\r
                        thissec = tval.tv_sec;\r
                        frames_shown = frames_done = tval.tv_usec/target_frametime;\r
                }\r
 \r
                // show notice message?\r
-               if(noticeMsgTime.tv_sec) {\r
+               if (noticeMsgTime.tv_sec)\r
+               {\r
                        static int noticeMsgSum;\r
                        if((tval.tv_sec*1000000+tval.tv_usec) - (noticeMsgTime.tv_sec*1000000+noticeMsgTime.tv_usec) > 2000000) { // > 2.0 sec\r
                                noticeMsgTime.tv_sec = noticeMsgTime.tv_usec = 0;\r
@@ -1265,7 +776,8 @@ void emu_Loop(void)
 \r
                // check for mode changes\r
                modes = ((Pico.video.reg[12]&1)<<2)|(Pico.video.reg[1]&8);\r
-               if (modes != oldmodes) {\r
+               if (modes != oldmodes)\r
+               {\r
                        int scalex = 320;\r
                        osd_fps_x = OSD_FPS_X;\r
                        if (modes & 4) {\r
@@ -1287,10 +799,11 @@ void emu_Loop(void)
                }\r
 \r
                // second changed?\r
-               if(thissec != tval.tv_sec) {\r
+               if (thissec != tval.tv_sec)\r
+               {\r
 #ifdef BENCHMARK\r
                        static int bench = 0, bench_fps = 0, bench_fps_s = 0, bfp = 0, bf[4];\r
-                       if(++bench == 10) {\r
+                       if (++bench == 10) {\r
                                bench = 0;\r
                                bench_fps_s = bench_fps;\r
                                bf[bfp++ & 3] = bench_fps;\r
@@ -1299,12 +812,13 @@ void emu_Loop(void)
                        bench_fps += frames_shown;\r
                        sprintf(fpsbuff, "%02i/%02i/%02i", frames_shown, bench_fps_s, (bf[0]+bf[1]+bf[2]+bf[3])>>2);\r
 #else\r
-                       if(currentConfig.EmuOpt & 2)\r
+                       if (currentConfig.EmuOpt & 2)\r
                                sprintf(fpsbuff, "%02i/%02i", frames_shown, frames_done);\r
+                       if (fpsbuff[5] == 0) { fpsbuff[5] = fpsbuff[6] = ' '; fpsbuff[7] = 0; }\r
 #endif\r
                        thissec = tval.tv_sec;\r
 \r
-                       if(PsndOut == 0 && currentConfig.Frameskip >= 0) {\r
+                       if (PsndOut == 0 && currentConfig.Frameskip >= 0) {\r
                                frames_done = frames_shown = 0;\r
                        } else {\r
                                // it is quite common for this implementation to leave 1 fame unfinished\r
@@ -1328,7 +842,7 @@ void emu_Loop(void)
                        for(i = 0; i < currentConfig.Frameskip; i++) {\r
                                updateKeys();\r
                                SkipFrame(1); frames_done++;\r
-                               if (PsndOut) { // do framelimitting if sound is enabled\r
+                               if (PsndOut && !reset_timing) { // do framelimitting if sound is enabled\r
                                        gettimeofday(&tval, 0);\r
                                        if(thissec != tval.tv_sec) tval.tv_usec+=1000000;\r
                                        if(tval.tv_usec < lim_time) { // we are too fast\r
@@ -1339,7 +853,7 @@ void emu_Loop(void)
                        }\r
                } else if(tval.tv_usec > lim_time) { // auto frameskip\r
                        // no time left for this frame - skip\r
-                       if (tval.tv_usec - lim_time >= 0x300000) {\r
+                       if (tval.tv_usec - lim_time >= 300000) {\r
                                /* something caused a slowdown for us (disk access? cache flush?)\r
                                 * try to recover by resetting timing... */\r
                                reset_timing = 1;\r
@@ -1415,13 +929,13 @@ if (Pico.m.frame_count == 31563) {
                gettimeofday(&tval, 0);\r
                if (thissec != tval.tv_sec) tval.tv_usec+=1000000;\r
 \r
-               if (currentConfig.Frameskip < 0 && tval.tv_usec - lim_time >= 0x300000) // slowdown detection\r
+               if (currentConfig.Frameskip < 0 && tval.tv_usec - lim_time >= 300000) // slowdown detection\r
                        reset_timing = 1;\r
                else if (PsndOut != NULL || currentConfig.Frameskip < 0)\r
                {\r
                        // sleep or vsync if we are still too fast\r
                        // usleep sleeps for ~20ms minimum, so it is not a solution here\r
-                       if(tval.tv_usec < lim_time)\r
+                       if (!reset_timing && tval.tv_usec < lim_time)\r
                        {\r
                                // we are too fast\r
                                if (vsync_offset) {\r
@@ -1439,6 +953,7 @@ if (Pico.m.frame_count == 31563) {
                frames_done++; frames_shown++;\r
        }\r
 \r
+       change_fast_forward(0);\r
 \r
        if (PicoMCD & 1) PicoCDBufferFree();\r
 \r
@@ -1451,7 +966,7 @@ if (Pico.m.frame_count == 31563) {
 \r
        // if in 8bit mode, generate 16bit image for menu background\r
        if ((PicoOpt&0x10) || !(currentConfig.EmuOpt&0x80))\r
-               emu_forced_frame();\r
+               emu_forcedFrame();\r
 }\r
 \r
 \r
@@ -1462,196 +977,3 @@ void emu_ResetGame(void)
 }\r
 \r
 \r
-size_t gzRead2(void *p, size_t _size, size_t _n, void *file)\r
-{\r
-       return gzread(file, p, _n);\r
-}\r
-\r
-\r
-size_t gzWrite2(void *p, size_t _size, size_t _n, void *file)\r
-{\r
-       return gzwrite(file, p, _n);\r
-}\r
-\r
-static int try_ropen_file(const char *fname)\r
-{\r
-       FILE *f;\r
-\r
-       f = fopen(fname, "rb");\r
-       if (f) {\r
-               fclose(f);\r
-               return 1;\r
-       }\r
-       return 0;\r
-}\r
-\r
-char *emu_GetSaveFName(int load, int is_sram, int slot)\r
-{\r
-       static char saveFname[512];\r
-       char ext[16];\r
-\r
-       if (is_sram)\r
-       {\r
-               romfname_ext(saveFname, (PicoMCD&1) ? "brm/" : "srm/", (PicoMCD&1) ? ".brm" : ".srm");\r
-               if (load) {\r
-                       if (try_ropen_file(saveFname)) return saveFname;\r
-                       // try in current dir..\r
-                       romfname_ext(saveFname, NULL, (PicoMCD&1) ? ".brm" : ".srm");\r
-                       if (try_ropen_file(saveFname)) return saveFname;\r
-                       return NULL; // give up\r
-               }\r
-       }\r
-       else\r
-       {\r
-               ext[0] = 0;\r
-               if(slot > 0 && slot < 10) sprintf(ext, ".%i", slot);\r
-               strcat(ext, (currentConfig.EmuOpt & 8) ? ".mds.gz" : ".mds");\r
-\r
-               romfname_ext(saveFname, "mds/", ext);\r
-               if (load) {\r
-                       if (try_ropen_file(saveFname)) return saveFname;\r
-                       romfname_ext(saveFname, NULL, ext);\r
-                       if (try_ropen_file(saveFname)) return saveFname;\r
-                       if (currentConfig.EmuOpt & 8) {\r
-                               ext[0] = 0;\r
-                               if(slot > 0 && slot < 10) sprintf(ext, ".%i", slot);\r
-                               strcat(ext, ".mds");\r
-\r
-                               romfname_ext(saveFname, "mds/", ext);\r
-                               if (try_ropen_file(saveFname)) return saveFname;\r
-                               romfname_ext(saveFname, NULL, ext);\r
-                               if (try_ropen_file(saveFname)) return saveFname;\r
-                       }\r
-                       return NULL;\r
-               }\r
-       }\r
-\r
-       return saveFname;\r
-}\r
-\r
-int emu_check_save_file(int slot)\r
-{\r
-       return emu_GetSaveFName(1, 0, slot) ? 1 : 0;\r
-}\r
-\r
-void emu_set_save_cbs(int gz)\r
-{\r
-       if (gz) {\r
-               areaRead  = gzRead2;\r
-               areaWrite = gzWrite2;\r
-               areaEof   = (areaeof *) gzeof;\r
-               areaSeek  = (areaseek *) gzseek;\r
-               areaClose = (areaclose *) gzclose;\r
-       } else {\r
-               areaRead  = (arearw *) fread;\r
-               areaWrite = (arearw *) fwrite;\r
-               areaEof   = (areaeof *) feof;\r
-               areaSeek  = (areaseek *) fseek;\r
-               areaClose = (areaclose *) fclose;\r
-       }\r
-}\r
-\r
-int emu_SaveLoadGame(int load, int sram)\r
-{\r
-       int ret = 0;\r
-       char *saveFname;\r
-\r
-       // make save filename\r
-       saveFname = emu_GetSaveFName(load, sram, state_slot);\r
-       if (saveFname == NULL) {\r
-               if (!sram) {\r
-                       strcpy(noticeMsg, load ? "LOAD FAILED (missing file)" : "SAVE FAILED  ");\r
-                       gettimeofday(&noticeMsgTime, 0);\r
-               }\r
-               return -1;\r
-       }\r
-\r
-       printf("saveLoad (%i, %i): %s\n", load, sram, saveFname);\r
-\r
-       if(sram) {\r
-               FILE *sramFile;\r
-               int sram_size;\r
-               unsigned char *sram_data;\r
-               int truncate = 1;\r
-               if (PicoMCD&1) {\r
-                       if (PicoOpt&0x8000) { // MCD RAM cart?\r
-                               sram_size = 0x12000;\r
-                               sram_data = SRam.data;\r
-                               if (sram_data)\r
-                                       memcpy32((int *)sram_data, (int *)Pico_mcd->bram, 0x2000/4);\r
-                       } else {\r
-                               sram_size = 0x2000;\r
-                               sram_data = Pico_mcd->bram;\r
-                               truncate  = 0; // the .brm may contain RAM cart data after normal brm\r
-                       }\r
-               } else {\r
-                       sram_size = SRam.end-SRam.start+1;\r
-                       if(Pico.m.sram_reg & 4) sram_size=0x2000;\r
-                       sram_data = SRam.data;\r
-               }\r
-               if (!sram_data) return 0; // SRam forcefully disabled for this game\r
-\r
-               if (load) {\r
-                       sramFile = fopen(saveFname, "rb");\r
-                       if(!sramFile) return -1;\r
-                       fread(sram_data, 1, sram_size, sramFile);\r
-                       fclose(sramFile);\r
-                       if ((PicoMCD&1) && (PicoOpt&0x8000))\r
-                               memcpy32((int *)Pico_mcd->bram, (int *)sram_data, 0x2000/4);\r
-               } else {\r
-                       // sram save needs some special processing\r
-                       // see if we have anything to save\r
-                       for (; sram_size > 0; sram_size--)\r
-                               if (sram_data[sram_size-1]) break;\r
-\r
-                       if (sram_size) {\r
-                               sramFile = fopen(saveFname, truncate ? "wb" : "r+b");\r
-                               if (!sramFile) sramFile = fopen(saveFname, "wb"); // retry\r
-                               if (!sramFile) return -1;\r
-                               ret = fwrite(sram_data, 1, sram_size, sramFile);\r
-                               ret = (ret != sram_size) ? -1 : 0;\r
-                               fclose(sramFile);\r
-#ifndef NO_SYNC\r
-                               sync();\r
-#endif\r
-                       }\r
-               }\r
-               return ret;\r
-       }\r
-       else\r
-       {\r
-               void *PmovFile = NULL;\r
-               if (strcmp(saveFname + strlen(saveFname) - 3, ".gz") == 0) {\r
-                       if( (PmovFile = gzopen(saveFname, load ? "rb" : "wb")) ) {\r
-                               emu_set_save_cbs(1);\r
-                               if(!load) gzsetparams(PmovFile, 9, Z_DEFAULT_STRATEGY);\r
-                       }\r
-               }\r
-               else\r
-               {\r
-                       if( (PmovFile = fopen(saveFname, load ? "rb" : "wb")) ) {\r
-                               emu_set_save_cbs(0);\r
-                       }\r
-               }\r
-               if(PmovFile) {\r
-                       ret = PmovState(load ? 6 : 5, PmovFile);\r
-                       areaClose(PmovFile);\r
-                       PmovFile = 0;\r
-                       if (load) Pico.m.dirtyPal=1;\r
-#ifndef NO_SYNC\r
-                       else sync();\r
-#endif\r
-               }\r
-               else    ret = -1;\r
-               if (!ret)\r
-                       strcpy(noticeMsg, load ? "GAME LOADED  " : "GAME SAVED   ");\r
-               else\r
-               {\r
-                       strcpy(noticeMsg, load ? "LOAD FAILED  " : "SAVE FAILED  ");\r
-                       ret = -1;\r
-               }\r
-\r
-               gettimeofday(&noticeMsgTime, 0);\r
-               return ret;\r
-       }\r
-}\r