X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=gp2x%2Femu.c;h=0375a7ff99bc0780635a6511b3c167b21008fe87;hb=8e708f920ffd20b026aed616e58c8c8e94c8fb8d;hp=871d05fd4a74e7d85285abe6734a5e88335e8300;hpb=3ef975c9e4839978545919a2684ba97d1a2a881a;p=libpicofe.git

diff --git a/gp2x/emu.c b/gp2x/emu.c
index 871d05f..0375a7f 100644
--- a/gp2x/emu.c
+++ b/gp2x/emu.c
@@ -1,4 +1,4 @@
-// (c) Copyright 2006 notaz, All rights reserved.
+// (c) Copyright 2006-2007 notaz, All rights reserved.
 // Free for non-commercial use.
 
 // For commercial use, separate licencing terms must be obtained.
@@ -6,6 +6,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/time.h>
+#include <sys/stat.h>
+#include <sys/types.h>
 #include <linux/limits.h>
 #include <ctype.h>
 #include <unistd.h>
@@ -16,12 +18,18 @@
 #include "gp2x.h"
 #include "usbjoy.h"
 #include "menu.h"
-#include "asmutils.h"
+#include "../common/arm_utils.h"
+#include "../common/fonts.h"
+#include "../common/emu.h"
+#include "../common/config.h"
 #include "cpuctrl.h"
 
-#include "Pico/PicoInt.h"
-#include "zlib/zlib.h"
+#include <Pico/PicoInt.h>
+#include <Pico/Patch.h>
+#include <Pico/sound/mix.h>
+#include <zlib/zlib.h>
 
+//#define PFRAMES
 
 #ifdef BENCHMARK
 #define OSD_FPS_X 220
@@ -29,517 +37,75 @@
 #define OSD_FPS_X 260
 #endif
 
-// PicoPad[] format: SACB RLDU
-char *actionNames[] = {
-	"UP", "DOWN", "LEFT", "RIGHT", "B", "C", "A", "START",
-	0, 0, 0, 0, 0, 0, 0, 0, // Z, Y, X, MODE (enabled only when needed), ?, ?, ?, ?
-	0, 0, 0, 0, 0, 0, 0, "ENTER MENU", // player2_flag, ?, ?, ?, ?, ?, ?, menu
-	"NEXT SAVE SLOT", "PREV SAVE SLOT", "SWITCH RENDERER", "SAVE STATE",
-	"LOAD STATE", "VOLUME UP", "VOLUME DOWN", "DONE"
-};
 
 int engineState;
 int select_exits = 0;
-char *PicoConfigFile = "picoconfig.bin";
-currentConfig_t currentConfig;
 
 char romFileName[PATH_MAX];
-unsigned char *rom_data = NULL;
 
 extern int crashed_940;
 
-static short sndBuffer[2*44100/50];
-static char noticeMsg[64];					// notice msg to draw
+static short __attribute__((aligned(4))) sndBuffer[2*44100/50];
 static struct timeval noticeMsgTime = { 0, 0 };	// when started showing
-static int reset_timing, osd_fps_x;
-static int combo_keys = 0, combo_acts = 0;	// keys and actions which need button combos
+static int osd_fps_x;
 static int gp2x_old_gamma = 100;
-static unsigned char *movie_data = NULL;
-static int movie_size = 0;
-unsigned char *framebuff = 0;  // temporary buffer for alt renderer
-int state_slot = 0;
+char noticeMsg[64];			// notice msg to draw
+unsigned char *PicoDraw2FB = NULL;  // temporary buffer for alt renderer
+int reset_timing = 0;
 
-/*
-// tmp
-static FILE *logf = NULL;
+static void emu_msg_cb(const char *msg);
+static void emu_msg_tray_open(void);
 
-void pprintf(char *texto, ...)
-{
-	va_list args;
 
-	va_start(args,texto);
-	vfprintf(logf,texto,args);
-	va_end(args);
-	fflush(logf);
-	sync();
-}
-*/
-// utilities
-static void strlwr(char* string)
+void emu_noticeMsgUpdated(void)
 {
-	while ( (*string++ = (char)tolower(*string)) );
-}
-
-static int try_rfn_cut(void)
-{
-	FILE *tmp;
-	char *p;
-
-	p = romFileName + strlen(romFileName) - 1;
-	for (; p > romFileName; p--)
-		if (*p == '.') break;
-	*p = 0;
-
-	if((tmp = fopen(romFileName, "rb"))) {
-		fclose(tmp);
-		return 1;
-	}
-	return 0;
-}
-
-static void get_ext(char *file, char *ext)
-{
-	char *p;
-
-	p = file + strlen(file) - 4;
-	if (p < file) p = file;
-	strncpy(ext, p, 4);
-	ext[4] = 0;
-	strlwr(ext);
-}
-
-char *biosfiles_us[] = { "us_scd2_9306", "SegaCDBIOS9303", "us_scd1_9210" };
-char *biosfiles_eu[] = { "eu_mcd2_9306", "eu_mcd2_9303",   "eu_mcd1_9210" };
-char *biosfiles_jp[] = { "jp_mcd1_9112", "jp_mcd1_9111" };
-
-extern char **g_argv;
-
-int find_bios(int region, char **bios_file)
-{
-	static char bios_path[1024];
-	int i, j, count;
-	char **files;
-	FILE *f = NULL;
-
-	if (region == 4) { // US
-		files = biosfiles_us;
-		count = sizeof(biosfiles_us) / sizeof(char *);
-	} else if (region == 8) { // EU
-		files = biosfiles_eu;
-		count = sizeof(biosfiles_eu) / sizeof(char *);
-	} else if (region == 1 || region == 2) {
-		files = biosfiles_jp;
-		count = sizeof(biosfiles_jp) / sizeof(char *);
-	} else {
-		return 0;
-	}
-
-	for (i = 0; i < count; i++)
-	{
-		strncpy(bios_path, g_argv[0], 1023);
-		bios_path[1024-32] = 0;
-		for (j = strlen(bios_path); j > 0; j--)
-			if (bios_path[j] == '/') { bios_path[j+1] = 0; break; }
-		strcat(bios_path, files[i]);
-		strcat(bios_path, ".bin");
-		f = fopen(bios_path, "rb");
-		if (f) break;
-
-		bios_path[strlen(bios_path) - 4] = 0;
-		strcat(bios_path, ".zip");
-		f = fopen(bios_path, "rb");
-		if (f) break;
-	}
-
-	if (f) {
-		printf("using bios: %s\n", bios_path);
-		fclose(f);
-		if (bios_file) *bios_file = bios_path;
-		return 1;
-	} else {
-		sprintf(menuErrorMsg, "no %s BIOS files found, read docs",
-			region != 4 ? (region == 8 ? "EU" : "JAP") : "USA");
-		printf("%s\n", menuErrorMsg);
-		return 0;
-	}
-}
-
-/* checks if romFileName points to valid MegaCD image
- * if so, checks for suitable BIOS */
-static int cd_check(char *ext, char **bios_file)
-{
-	unsigned char buf[32];
-	FILE *cd_f;
-	int type = 0, region = 4; // 1: Japan, 4: US, 8: Europe
-
-	cd_f = fopen(romFileName, "rb");
-	if (!cd_f) return 0; // let the upper level handle this
-
-	if (fread(buf, 1, 32, cd_f) != 32) {
-		fclose(cd_f);
-		return 0;
-	}
-
-	if (!strncasecmp("SEGADISCSYSTEM", (char *)buf+0x00, 14)) type = 1;       // Sega CD (ISO)
-	if (!strncasecmp("SEGADISCSYSTEM", (char *)buf+0x10, 14)) type = 2;       // Sega CD (BIN)
-	if (type == 0) {
-		fclose(cd_f);
-		return 0;
-	}
-
-	/* it seems we have a CD image here. Try to detect region and load a suitable BIOS now.. */
-	fseek(cd_f, (type == 1) ? 0x100+0x10B : 0x110+0x10B, SEEK_SET);
-	fread(buf, 1, 1, cd_f);
-	fclose(cd_f);
-
-	if (buf[0] == 0x64) region = 8; // EU
-	if (buf[0] == 0xa1) region = 1; // JAP
-
-	printf("detected %s Sega/Mega CD image with %s region\n",
-		type == 2 ? "BIN" : "ISO", region != 4 ? (region == 8 ? "EU" : "JAP") : "USA");
-
-	if (PicoRegionOverride) {
-		region = PicoRegionOverride;
-		printf("overrided region to %s\n", region != 4 ? (region == 8 ? "EU" : "JAP") : "USA");
-	}
-
-	if(find_bios(region, bios_file))
-		 return type;	// CD and BIOS detected
-
-	return -1;     		// CD detected but load failed
+	gettimeofday(&noticeMsgTime, 0);
 }
 
-int emu_ReloadRom(void)
+void emu_getMainDir(char *dst, int len)
 {
-	unsigned int rom_size = 0;
-	char *used_rom_name = romFileName;
-	char ext[5];
-	FILE *rom;
-	int ret, cd_state;
-
-	printf("emu_ReloadRom(%s)\n", romFileName);
-
-	get_ext(romFileName, ext);
-
-	// detect wrong extensions
-	if(!strcmp(ext, ".srm") || !strcmp(ext, "s.gz") || !strcmp(ext, ".mds")) { // s.gz ~ .mds.gz
-		sprintf(menuErrorMsg, "Not a ROM selected.");
-		return 0;
-	}
-
-	// check for movie file
-	if(movie_data) {
-		free(movie_data);
-		movie_data = 0;
-	}
-	if(!strcmp(ext, ".gmv")) {
-		// check for both gmv and rom
-		int dummy;
-		FILE *movie_file = fopen(romFileName, "rb");
-		if(!movie_file) {
-			sprintf(menuErrorMsg, "Failed to open movie.");
-			return 0;
-		}
-		fseek(movie_file, 0, SEEK_END);
-		movie_size = ftell(movie_file);
-		fseek(movie_file, 0, SEEK_SET);
-		if(movie_size < 64+3) {
-			sprintf(menuErrorMsg, "Invalid GMV file.");
-			fclose(movie_file);
-			return 0;
-		}
-		movie_data = malloc(movie_size);
-		if(movie_data == NULL) {
-			sprintf(menuErrorMsg, "low memory.");
-			fclose(movie_file);
-			return 0;
-		}
-		fread(movie_data, 1, movie_size, movie_file);
-		fclose(movie_file);
-		if (strncmp((char *)movie_data, "Gens Movie TEST", 15) != 0) {
-			sprintf(menuErrorMsg, "Invalid GMV file.");
-			return 0;
-		}
-		dummy = try_rfn_cut() || try_rfn_cut();
-		if (!dummy) {
-			sprintf(menuErrorMsg, "Could't find a ROM for movie.");
-			return 0;
-		}
-		get_ext(romFileName, ext);
-	}
-
-	// check for MegaCD image
-	cd_state = cd_check(ext, &used_rom_name);
-	if (cd_state > 0) {
-		PicoMCD |= 1;
-		get_ext(used_rom_name, ext);
-	} else if (cd_state == -1) {
-		// bios_help() ?
-		return 0;
-	} else {
-		if (PicoMCD & 1) PicoExitMCD();
-		PicoMCD &= ~1;
-	}
-
-	rom = fopen(used_rom_name, "rb");
-	if(!rom) {
-		sprintf(menuErrorMsg, "Failed to open rom.");
-		return 0;
-	}
-
-	if(rom_data) {
-		free(rom_data);
-		rom_data = 0;
-		rom_size = 0;
-	}
-
-	// zipfile support
-	if(!strcasecmp(ext, ".zip")) {
-		fclose(rom);
-		ret = CartLoadZip(used_rom_name, &rom_data, &rom_size);
-		if(ret) {
-			if (ret == 4) strcpy(menuErrorMsg, "No ROMs found in zip.");
-			else sprintf(menuErrorMsg, "Unzip failed with code %i", ret);
-			printf("%s\n", menuErrorMsg);
-			return 0;
-		}
-	} else {
-		if( (ret = PicoCartLoad(rom, &rom_data, &rom_size)) ) {
-			sprintf(menuErrorMsg, "PicoCartLoad() failed.");
-			printf("%s\n", menuErrorMsg);
-			fclose(rom);
-			return 0;
-		}
-		fclose(rom);
-	}
-
-	// detect wrong files (Pico crashes on very small files), also see if ROM EP is good
-	if(rom_size <= 0x200 || strncmp((char *)rom_data, "Pico", 4) == 0 ||
-	  ((*(unsigned short *)(rom_data+4)<<16)|(*(unsigned short *)(rom_data+6))) >= (int)rom_size) {
-		if (rom_data) free(rom_data);
-		rom_data = 0;
-		sprintf(menuErrorMsg, "Not a ROM selected.");
-		return 0;
-	}
-
-	// load config for this ROM (do this before insert to get correct region)
-	ret = emu_ReadConfig(1);
-	if (!ret)
-		emu_ReadConfig(0);
+	extern char **g_argv;
+	int j;
 
-	printf("PicoCartInsert(%p, %d);\n", rom_data, rom_size);
-	if(PicoCartInsert(rom_data, rom_size)) {
-		sprintf(menuErrorMsg, "Failed to load ROM.");
-		return 0;
-	}
-
-	Pico.m.frame_count = 0;
-
-	// insert CD if it was detected
-	if (cd_state > 0) {
-		ret = Insert_CD(romFileName, cd_state == 2);
-		if (ret != 0) {
-			sprintf(menuErrorMsg, "Insert_CD() failed, invalid CD image?");
-			printf("%s\n", menuErrorMsg);
-			return 0;
-		}
-	}
-
-	// emu_ReadConfig() might have messed currentConfig.lastRomFile
-	strncpy(currentConfig.lastRomFile, romFileName, sizeof(currentConfig.lastRomFile)-1);
-	currentConfig.lastRomFile[sizeof(currentConfig.lastRomFile)-1] = 0;
-
-	// additional movie stuff
-	if(movie_data) {
-		if(movie_data[0x14] == '6')
-		     PicoOpt |=  0x20; // 6 button pad
-		else PicoOpt &= ~0x20;
-		PicoOpt |= 0x40; // accurate timing
-		if(movie_data[0xF] >= 'A') {
-			if(movie_data[0x16] & 0x80) {
-				PicoRegionOverride = 8;
-			} else {
-				PicoRegionOverride = 4;
-			}
-			PicoReset(0);
-			// TODO: bits 6 & 5
-		}
-		movie_data[0x18+30] = 0;
-		sprintf(noticeMsg, "MOVIE: %s", (char *) &movie_data[0x18]);
-	}
-	else
-	{
-		if(Pico.m.pal) {
-			strcpy(noticeMsg, "PAL SYSTEM / 50 FPS");
-		} else {
-			strcpy(noticeMsg, "NTSC SYSTEM / 60 FPS");
-		}
-	}
-	gettimeofday(&noticeMsgTime, 0);
-
-	// load SRAM for this ROM
-	if(currentConfig.EmuOpt & 1)
-		emu_SaveLoadGame(1, 1);
-
-	return 1;
+	strncpy(dst, g_argv[0], len);
+	len -= 32; // reserve
+	if (len < 0) len = 0;
+	dst[len] = 0;
+	for (j = strlen(dst); j > 0; j--)
+		if (dst[j] == '/') { dst[j+1] = 0; break; }
 }
 
-
 void emu_Init(void)
 {
 	// make temp buffer for alt renderer
-	framebuff = malloc((8+320)*(8+240+8));
-	if (!framebuff)
-	{
-		printf("framebuff == 0\n");
-	}
-
-	PicoInit();
-
-//	logf = fopen("log.txt", "w");
-}
-
-
-static void romfname_ext(char *dst, char *ext)
-{
-	char *p;
-
-	// make save filename
-	for (p = romFileName+strlen(romFileName)-1; p >= romFileName && *p != '/'; p--); p++;
-	strncpy(dst, p, 511);
-	dst[511-8] = 0;
-	if(dst[strlen(dst)-4] == '.') dst[strlen(dst)-4] = 0;
-	strcat(dst, ext);
-}
-
-
-static void find_combos(void)
-{
-	int act, u;
-
-	// find out which keys and actions are combos
-	combo_keys = combo_acts = 0;
-	for (act = 0; act < 32; act++)
+	PicoDraw2FB = malloc((8+320)*(8+240+8));
+	if (!PicoDraw2FB)
 	{
-		int keyc = 0;
-		if (act == 16) continue; // player2 flag
-		for (u = 0; u < 32; u++)
-		{
-			if (currentConfig.KeyBinds[u] & (1 << act)) keyc++;
-		}
-		if (keyc > 1)
-		{
-			// loop again and mark those keys and actions as combo
-			for (u = 0; u < 32; u++)
-			{
-				if (currentConfig.KeyBinds[u] & (1 << act)) {
-					combo_keys |= 1 << u;
-					combo_acts |= 1 << act;
-				}
-			}
-		}
+		printf("PicoDraw2FB == 0\n");
 	}
-	// printf("combo keys/acts: %08x %08x\n", combo_keys, combo_acts);
-}
-
 
-int emu_ReadConfig(int game)
-{
-	FILE *f;
-	char cfg[512];
-	int bread = 0;
+	// make dirs for saves, cfgs, etc.
+	mkdir("mds", 0777);
+	mkdir("srm", 0777);
+	mkdir("brm", 0777);
+	mkdir("cfg", 0777);
 
-	if (!game)
-	{
-		// set default config
-		memset(&currentConfig, 0, sizeof(currentConfig));
-		currentConfig.lastRomFile[0] = 0;
-		currentConfig.EmuOpt  = 0x1f | 0x400; // | cd_leds
-		currentConfig.PicoOpt = 0x0f | 0xe00; // | use_940 | cd_pcm | cd_cdda
-		currentConfig.PsndRate = 22050; // 44100;
-		currentConfig.PicoRegion = 0; // auto
-		currentConfig.PicoAutoRgnOrder = 0x184; // US, EU, JP
-		currentConfig.Frameskip = -1; // auto
-		currentConfig.CPUclock = 200;
-		currentConfig.volume = 50;
-		currentConfig.KeyBinds[ 0] = 1<<0; // SACB RLDU
-		currentConfig.KeyBinds[ 4] = 1<<1;
-		currentConfig.KeyBinds[ 2] = 1<<2;
-		currentConfig.KeyBinds[ 6] = 1<<3;
-		currentConfig.KeyBinds[14] = 1<<4;
-		currentConfig.KeyBinds[13] = 1<<5;
-		currentConfig.KeyBinds[12] = 1<<6;
-		currentConfig.KeyBinds[ 8] = 1<<7;
-		currentConfig.KeyBinds[15] = 1<<26; // switch rend
-		currentConfig.KeyBinds[10] = 1<<27; // save state
-		currentConfig.KeyBinds[11] = 1<<28; // load state
-		currentConfig.KeyBinds[23] = 1<<29; // vol up
-		currentConfig.KeyBinds[22] = 1<<30; // vol down
-		currentConfig.gamma = 100;
-		strncpy(cfg, PicoConfigFile, 511);
-		cfg[511] = 0;
-	} else {
-		romfname_ext(cfg, ".pbcfg");
-	}
-
-	printf("emu_ReadConfig: %s ", cfg);
-	f = fopen(cfg, "rb");
-	if (f) {
-		bread = fread(&currentConfig, 1, sizeof(currentConfig), f);
-		fclose(f);
-	}
-	printf((bread == sizeof(currentConfig)) ? "(ok)\n" : "(failed)\n");
-
-	PicoOpt = currentConfig.PicoOpt;
-	PsndRate = currentConfig.PsndRate;
-	PicoRegionOverride = currentConfig.PicoRegion;
-	PicoAutoRgnOrder = currentConfig.PicoAutoRgnOrder;
-	if (PicoOpt & 0x20) {
-		actionNames[ 8] = "Z"; actionNames[ 9] = "Y";
-		actionNames[10] = "X"; actionNames[11] = "MODE";
-	}
-	// some sanity checks
-	if (currentConfig.CPUclock < 1 || currentConfig.CPUclock > 4096) currentConfig.CPUclock = 200;
-	if (currentConfig.gamma < 10 || currentConfig.gamma > 300) currentConfig.gamma = 100;
-	// if volume keys are unbound, bind them to volume control
-	if (!currentConfig.KeyBinds[23] && !currentConfig.KeyBinds[22]) {
-		currentConfig.KeyBinds[23] = 1<<29; // vol up
-		currentConfig.KeyBinds[22] = 1<<30; // vol down
-	}
-
-	return (bread == sizeof(currentConfig));
+	PicoInit();
+	PicoMessage = emu_msg_cb;
+	PicoMCDopenTray = emu_msg_tray_open;
+	PicoMCDcloseTray = menu_loop_tray;
 }
 
 
-int emu_WriteConfig(int game)
+static void scaling_update(void)
 {
-	FILE *f;
-	char cfg[512];
-	int bwrite = 0;
-
-	if (!game)
-	{
-		strncpy(cfg, PicoConfigFile, 511);
-		cfg[511] = 0;
-	} else {
-		romfname_ext(cfg, ".pbcfg");
-	}
-
-	printf("emu_WriteConfig: %s ", cfg);
-	f = fopen(cfg, "wb");
-	if (f) {
-		currentConfig.PicoOpt = PicoOpt;
-		currentConfig.PsndRate = PsndRate;
-		currentConfig.PicoRegion = PicoRegionOverride;
-		currentConfig.PicoAutoRgnOrder = PicoAutoRgnOrder;
-		bwrite = fwrite(&currentConfig, 1, sizeof(currentConfig), f);
-		fflush(f);
-		fclose(f);
-		sync();
+	PicoOpt &= ~0x4100;
+	switch (currentConfig.scaling) {
+		default: break; // off
+		case 1:  // hw hor
+		case 2:  PicoOpt |=  0x0100; break; // hw hor+vert
+		case 3:  PicoOpt |=  0x4000; break; // sw hor
 	}
-	printf((bwrite == sizeof(currentConfig)) ? "(ok)\n" : "(failed)\n");
-
-	return (bwrite == sizeof(currentConfig));
 }
 
 
@@ -551,20 +117,62 @@ void emu_Deinit(void)
 		SRam.changed = 0;
 	}
 
-	if (!(currentConfig.EmuOpt & 0x20))
-		emu_WriteConfig(0);
-	free(framebuff);
+	if (!(currentConfig.EmuOpt & 0x20)) {
+		config_writelrom(PicoConfigFile);
+#ifndef NO_SYNC
+		sync();
+#endif
+	}
+
+	free(PicoDraw2FB);
 
 	PicoExit();
-//	fclose(logf);
 
 	// restore gamma
 	if (gp2x_old_gamma != 100)
-		set_gamma(100);
-}
-
-
-void osd_text(int x, int y, char *text)
+		set_gamma(100, 0);
+}
+
+void emu_prepareDefaultConfig(void)
+{
+	memset(&defaultConfig, 0, sizeof(defaultConfig));
+	defaultConfig.EmuOpt    = 0x1d | 0x00700; // | <- ram_tmng, confirm_save, cd_leds
+	defaultConfig.s_PicoOpt = 0x0f | 0x20e00; // | <- use_940, cd_pcm, cd_cdda, svp drc
+	defaultConfig.s_PsndRate = 44100;
+	defaultConfig.s_PicoRegion = 0; // auto
+	defaultConfig.s_PicoAutoRgnOrder = 0x184; // US, EU, JP
+	defaultConfig.s_PicoCDBuffers = 64;
+	defaultConfig.Frameskip = -1; // auto
+	defaultConfig.CPUclock = 200;
+	defaultConfig.volume = 50;
+	defaultConfig.KeyBinds[ 0] = 1<<0; // SACB RLDU
+	defaultConfig.KeyBinds[ 4] = 1<<1;
+	defaultConfig.KeyBinds[ 2] = 1<<2;
+	defaultConfig.KeyBinds[ 6] = 1<<3;
+	defaultConfig.KeyBinds[14] = 1<<4;
+	defaultConfig.KeyBinds[13] = 1<<5;
+	defaultConfig.KeyBinds[12] = 1<<6;
+	defaultConfig.KeyBinds[ 8] = 1<<7;
+	defaultConfig.KeyBinds[15] = 1<<26; // switch rend
+	defaultConfig.KeyBinds[10] = 1<<27; // save state
+	defaultConfig.KeyBinds[11] = 1<<28; // load state
+	defaultConfig.KeyBinds[23] = 1<<29; // vol up
+	defaultConfig.KeyBinds[22] = 1<<30; // vol down
+	defaultConfig.gamma = 100;
+	defaultConfig.scaling = 0;
+}
+
+void emu_setDefaultConfig(void)
+{
+	memcpy(&currentConfig, &defaultConfig, sizeof(currentConfig));
+	PicoOpt = currentConfig.s_PicoOpt;
+	PsndRate = currentConfig.s_PsndRate;
+	PicoRegionOverride = currentConfig.s_PicoRegion;
+	PicoAutoRgnOrder = currentConfig.s_PicoAutoRgnOrder;
+	PicoCDBuffers = currentConfig.s_PicoCDBuffers;
+}
+
+void osd_text(int x, int y, const char *text)
 {
 	int len = strlen(text)*8;
 
@@ -576,7 +184,7 @@ void osd_text(int x, int y, char *text)
 			p = (int *) ((unsigned char *) gp2x_screen+x+320*(y+h));
 			for (i = len; i; i--, p++) *p = 0xe0e0e0e0;
 		}
-		gp2x_text_out8_2(x, y, text, 0xf0);
+		emu_textOut8(x, y, text);
 	} else {
 		int *p, i, h;
 		x &= ~1; // align x
@@ -585,16 +193,15 @@ void osd_text(int x, int y, char *text)
 			p = (int *) ((unsigned short *) gp2x_screen+x+320*(y+h));
 			for (i = len; i; i--, p++) *p = (*p>>2)&0x39e7;
 		}
-		gp2x_text_out15(x, y, text);
+		emu_textOut16(x, y, text);
 	}
 }
 
 static void cd_leds(void)
 {
-	// mmu problems?
 //	static
 	int old_reg;
-//	if (!((Pico_mcd->s68k_regs[0] ^ old_reg) & 3)) return; // no change
+//	if (!((Pico_mcd->s68k_regs[0] ^ old_reg) & 3)) return; // no change // mmu hack problems?
 	old_reg = Pico_mcd->s68k_regs[0];
 
 	if ((PicoOpt&0x10)||!(currentConfig.EmuOpt&0x80)) {
@@ -614,7 +221,7 @@ static void cd_leds(void)
 		unsigned int col_r = (old_reg & 1) ? 0xc000c000 : 0;
 		*p++ = col_g; *p++ = col_g; p+=2; *p++ = col_r; *p++ = col_r; p += 320/2 - 12/2;
 		*p++ = col_g; *p++ = col_g; p+=2; *p++ = col_r; *p++ = col_r; p += 320/2 - 12/2;
-		*p++ = col_g; *p++ = col_g; p+=2; *p++ = col_r; *p++ = col_r; p += 320/2 - 12/2;
+		*p++ = col_g; *p++ = col_g; p+=2; *p++ = col_r; *p++ = col_r;
 	}
 }
 
@@ -634,14 +241,15 @@ static int EmuScan8(unsigned int num, void *sdata)
 	return 0;
 }
 
-static int localPal[0x100];
+int localPal[0x100];
 static void (*vidCpyM2)(void *dest, void *src) = NULL;
 
-static void blit(char *fps, char *notice)
+static void blit(const char *fps, const char *notice)
 {
 	int emu_opt = currentConfig.EmuOpt;
 
-	if (PicoOpt&0x10) {
+	if (PicoOpt&0x10)
+	{
 		// 8bit fast renderer
 		if (Pico.m.dirtyPal) {
 			Pico.m.dirtyPal = 0;
@@ -649,8 +257,14 @@ static void blit(char *fps, char *notice)
 			// feed new palette to our device
 			gp2x_video_setpalette(localPal, 0x40);
 		}
-		vidCpyM2((unsigned char *)gp2x_screen+320*8, framebuff+328*8);
-	} else if (!(emu_opt&0x80)) {
+		// a hack for VR
+		if (PicoRead16Hook == PicoSVPRead16)
+			memset32((int *)(PicoDraw2FB+328*8+328*223), 0xe0e0e0e0, 328);
+		// do actual copy
+		vidCpyM2((unsigned char *)gp2x_screen+320*8, PicoDraw2FB+328*8);
+	}
+	else if (!(emu_opt&0x80))
+	{
 		// 8bit accurate renderer
 		if (Pico.m.dirtyPal) {
 			Pico.m.dirtyPal = 0;
@@ -676,9 +290,13 @@ static void blit(char *fps, char *notice)
 		}
 	}
 
-	if (notice) osd_text(4, 232, notice);
-	if (emu_opt & 2)
-		osd_text(osd_fps_x, 232, fps);
+	if (notice || (emu_opt & 2)) {
+		int h = 232;
+		if (currentConfig.scaling == 2 && !(Pico.video.reg[1]&8)) h -= 8;
+		if (notice) osd_text(4, h, notice);
+		if (emu_opt & 2)
+			osd_text(osd_fps_x, h, fps);
+	}
 	if ((emu_opt & 0x400) && (PicoMCD & 1))
 		cd_leds();
 
@@ -719,7 +337,7 @@ static void vidResetMode(void)
 	if (PicoOpt&0x10) {
 		gp2x_video_changemode(8);
 	} else if (currentConfig.EmuOpt&0x80) {
-		gp2x_video_changemode(15);
+		gp2x_video_changemode(16);
 		PicoDrawSetColorFormat(1);
 		PicoScan = EmuScan16;
 		PicoScan(0, 0);
@@ -741,49 +359,130 @@ static void vidResetMode(void)
 	}
 	Pico.m.dirtyPal = 1;
 	// reset scaling
-	gp2x_video_RGB_setscaling((PicoOpt&0x100)&&!(Pico.video.reg[12]&1) ? 256 : 320, 240);
+	if (currentConfig.scaling == 2 && !(Pico.video.reg[1]&8))
+	     gp2x_video_RGB_setscaling(8, (PicoOpt&0x100)&&!(Pico.video.reg[12]&1) ? 256 : 320, 224);
+	else gp2x_video_RGB_setscaling(0, (PicoOpt&0x100)&&!(Pico.video.reg[12]&1) ? 256 : 320, 240);
 }
 
 
-static int check_save_file(void)
+static void emu_msg_cb(const char *msg)
 {
-	char saveFname[512];
-	char ext[16];
-	FILE *f;
+	if ((PicoOpt&0x10)||!(currentConfig.EmuOpt&0x80)) {
+		// 8-bit renderers
+		gp2x_memset_all_buffers(320*232, 0xe0, 320*8);
+		osd_text(4, 232, msg);
+		gp2x_memcpy_all_buffers((char *)gp2x_screen+320*232, 320*232, 320*8);
+	} else {
+		// 16bit accurate renderer
+		gp2x_memset_all_buffers(320*232*2, 0, 320*8*2);
+		osd_text(4, 232, msg);
+		gp2x_memcpy_all_buffers((char *)gp2x_screen+320*232*2, 320*232*2, 320*8*2);
+	}
+	gettimeofday(&noticeMsgTime, 0);
+	noticeMsgTime.tv_sec -= 2;
+
+	/* assumption: emu_msg_cb gets called only when something slow is about to happen */
+	reset_timing = 1;
+}
+
+static void emu_state_cb(const char *str)
+{
+	clearArea(0);
+	blit("", str);
+}
+
+static void emu_msg_tray_open(void)
+{
+	strcpy(noticeMsg, "CD tray opened");
+	gettimeofday(&noticeMsgTime, 0);
+}
+
+static void update_volume(int has_changed, int is_up)
+{
+	static int prev_frame = 0, wait_frames = 0;
+	int vol = currentConfig.volume;
+
+	if (has_changed)
+	{
+		if (vol < 5 && (PicoOpt&8) && prev_frame == Pico.m.frame_count - 1 && wait_frames < 12)
+			wait_frames++;
+		else {
+			if (is_up) {
+				if (vol < 99) vol++;
+			} else {
+				if (vol >  0) vol--;
+			}
+			wait_frames = 0;
+			gp2x_sound_volume(vol, vol);
+			currentConfig.volume = vol;
+		}
+		sprintf(noticeMsg, "VOL: %02i", vol);
+		gettimeofday(&noticeMsgTime, 0);
+		prev_frame = Pico.m.frame_count;
+	}
 
-	ext[0] = 0;
-	if(state_slot > 0 && state_slot < 10) sprintf(ext, ".%i", state_slot);
-	strcat(ext, ".mds");
-	if(currentConfig.EmuOpt & 8) strcat(ext, ".gz");
+	// set the right mixer func
+	if (!(PicoOpt&8)) return; // just use defaults for mono
+	if (vol >= 5)
+		PsndMix_32_to_16l = mix_32_to_16l_stereo;
+	else {
+		mix_32_to_16l_level = 5 - vol;
+		PsndMix_32_to_16l = mix_32_to_16l_stereo_lvl;
+	}
+}
 
-	romfname_ext(saveFname, ext);
-	if ((f = fopen(saveFname, "rb"))) {
-		fclose(f);
-		return 1;
+static void change_fast_forward(int set_on)
+{
+	static void *set_PsndOut = NULL;
+	static int set_Frameskip, set_EmuOpt, is_on = 0;
+
+	if (set_on && !is_on) {
+		set_PsndOut = PsndOut;
+		set_Frameskip = currentConfig.Frameskip;
+		set_EmuOpt = currentConfig.EmuOpt;
+		PsndOut = NULL;
+		currentConfig.Frameskip = 8;
+		currentConfig.EmuOpt &= ~4;
+		is_on = 1;
+	}
+	else if (!set_on && is_on) {
+		PsndOut = set_PsndOut;
+		currentConfig.Frameskip = set_Frameskip;
+		currentConfig.EmuOpt = set_EmuOpt;
+		PsndRerate(1);
+		update_volume(0, 0);
+		reset_timing = 1;
+		is_on = 0;
 	}
-	return 0;
 }
 
 static void RunEvents(unsigned int which)
 {
-	if(which & 0x1800) { // save or load (but not both)
+	if (which & 0x1800) // save or load (but not both)
+	{
 		int do_it = 1;
-		if (!(which & 0x1000) && (currentConfig.EmuOpt & 0x200) && check_save_file()) {
+		if ( emu_checkSaveFile(state_slot) &&
+				(( (which & 0x1000) && (currentConfig.EmuOpt & 0x800)) ||   // load
+				 (!(which & 0x1000) && (currentConfig.EmuOpt & 0x200))) ) { // save
 			unsigned long keys;
-			blit("", "OVERWRITE SAVE? (Y=yes, X=no)");
+			blit("", (which & 0x1000) ? "LOAD STATE? (Y=yes, X=no)" : "OVERWRITE SAVE? (Y=yes, X=no)");
 			while( !((keys = gp2x_joystick_read(1)) & (GP2X_X|GP2X_Y)) )
 				usleep(50*1024);
 			if (keys & GP2X_X) do_it = 0;
 			clearArea(0);
 		}
 		if (do_it) {
-			blit("", (which & 0x1000) ? "LOADING GAME" : "SAVING GAME");
-			emu_SaveLoadGame(which & 0x1000, 0);
+			osd_text(4, 232, (which & 0x1000) ? "LOADING GAME" : "SAVING GAME");
+			PicoStateProgressCB = emu_state_cb;
+			gp2x_memcpy_all_buffers(gp2x_screen, 0, 320*240*2);
+			emu_SaveLoadGame((which & 0x1000) >> 12, 0);
+			PicoStateProgressCB = NULL;
 		}
 
 		reset_timing = 1;
 	}
-	if(which & 0x0400) { // switch renderer
+	if (which & 0x0400) // switch renderer
+	{
 		if      (  PicoOpt&0x10)             { PicoOpt&=~0x10; currentConfig.EmuOpt |= 0x80; }
 		else if (!(currentConfig.EmuOpt&0x80)) PicoOpt|= 0x10;
 		else   currentConfig.EmuOpt &= ~0x80;
@@ -800,7 +499,8 @@ static void RunEvents(unsigned int which)
 
 		gettimeofday(&noticeMsgTime, 0);
 	}
-	if(which & 0x0300) {
+	if (which & 0x0300)
+	{
 		if(which&0x0200) {
 			state_slot -= 1;
 			if(state_slot < 0) state_slot = 9;
@@ -808,44 +508,15 @@ static void RunEvents(unsigned int which)
 			state_slot += 1;
 			if(state_slot > 9) state_slot = 0;
 		}
-		sprintf(noticeMsg, "SAVE SLOT %i [%s]", state_slot, check_save_file() ? "USED" : "FREE");
+		sprintf(noticeMsg, "SAVE SLOT %i [%s]", state_slot, emu_checkSaveFile(state_slot) ? "USED" : "FREE");
 		gettimeofday(&noticeMsgTime, 0);
 	}
-	if(which & 0x0080) {
+	if (which & 0x0080) {
 		engineState = PGS_Menu;
 	}
 }
 
 
-static void updateMovie(void)
-{
-	int offs = Pico.m.frame_count*3 + 0x40;
-	if (offs+3 > movie_size) {
-		free(movie_data);
-		movie_data = 0;
-		strcpy(noticeMsg, "END OF MOVIE.");
-		printf("END OF MOVIE.\n");
-		gettimeofday(&noticeMsgTime, 0);
-	} else {
-		// MXYZ SACB RLDU
-		PicoPad[0] = ~movie_data[offs]   & 0x8f; // ! SCBA RLDU
-		if(!(movie_data[offs]   & 0x10)) PicoPad[0] |= 0x40; // A
-		if(!(movie_data[offs]   & 0x20)) PicoPad[0] |= 0x10; // B
-		if(!(movie_data[offs]   & 0x40)) PicoPad[0] |= 0x20; // A
-		PicoPad[1] = ~movie_data[offs+1] & 0x8f; // ! SCBA RLDU
-		if(!(movie_data[offs+1] & 0x10)) PicoPad[1] |= 0x40; // A
-		if(!(movie_data[offs+1] & 0x20)) PicoPad[1] |= 0x10; // B
-		if(!(movie_data[offs+1] & 0x40)) PicoPad[1] |= 0x20; // A
-		PicoPad[0] |= (~movie_data[offs+2] & 0x0A) << 8; // ! MZYX
-		if(!(movie_data[offs+2] & 0x01)) PicoPad[0] |= 0x0400; // X
-		if(!(movie_data[offs+2] & 0x04)) PicoPad[0] |= 0x0100; // Z
-		PicoPad[1] |= (~movie_data[offs+2] & 0xA0) << 4; // ! MZYX
-		if(!(movie_data[offs+2] & 0x10)) PicoPad[1] |= 0x0400; // X
-		if(!(movie_data[offs+2] & 0x40)) PicoPad[1] |= 0x0100; // Z
-	}
-}
-
-
 static void updateKeys(void)
 {
 	unsigned long keys, allActions[2] = { 0, 0 }, events;
@@ -863,23 +534,26 @@ static void updateKeys(void)
 
 	for (i = 0; i < 32; i++)
 	{
-		if (keys & (1 << i)) {
+		if (keys & (1 << i))
+		{
 			int pl, acts = currentConfig.KeyBinds[i];
 			if (!acts) continue;
 			pl = (acts >> 16) & 1;
-			if (combo_keys & (1 << i)) {
-				int u = i+1, acts_c = acts & combo_acts;
+			if (kb_combo_keys & (1 << i))
+			{
+				int u, acts_c = acts & kb_combo_acts;
 				// let's try to find the other one
-				if (acts_c)
-					for (; u < 32; u++)
-						if ( (currentConfig.KeyBinds[u] & acts_c) && (keys & (1 << u)) ) {
-							allActions[pl] |= acts_c;
+				if (acts_c) {
+					for (u = i + 1; u < 32; u++)
+						if ( (keys & (1 << u)) && (currentConfig.KeyBinds[u] & acts_c) ) {
+							allActions[pl] |= acts_c & currentConfig.KeyBinds[u];
 							keys &= ~((1 << i) | (1 << u));
 							break;
 						}
+				}
 				// add non-combo actions if combo ones were not found
 				if (!acts_c || u == 32)
-					allActions[pl] |= acts & ~combo_acts;
+					allActions[pl] |= acts & ~kb_combo_acts;
 			} else {
 				allActions[pl] |= acts;
 			}
@@ -908,22 +582,15 @@ static void updateKeys(void)
 	events = (allActions[0] | allActions[1]) >> 16;
 
 	// volume is treated in special way and triggered every frame
-	if(events & 0x6000) {
-		int vol = currentConfig.volume;
-		if (events & 0x2000) {
-			if (vol < 90) vol++;
-		} else {
-			if (vol >  0) vol--;
-		}
-		gp2x_sound_volume(vol, vol);
-		sprintf(noticeMsg, "VOL: %02i", vol);
-		gettimeofday(&noticeMsgTime, 0);
-		currentConfig.volume = vol;
-	}
+	if (events & 0x6000)
+		update_volume(1, events & 0x2000);
+
+	if ((events ^ prevEvents) & 0x40)
+		change_fast_forward(events & 0x40);
 
 	events &= ~prevEvents;
 	if (events) RunEvents(events);
-	if (movie_data) updateMovie();
+	if (movie_data) emu_updateMovie();
 
 	prevEvents = (allActions[0] | allActions[1]) >> 16;
 }
@@ -933,28 +600,50 @@ static void updateSound(int len)
 {
 	if (PicoOpt&8) len<<=1;
 
-	gp2x_sound_write(PsndOut, len<<1);
+	/* avoid writing audio when lagging behind to prevent audio lag */
+	if (PicoSkipFrame != 2)
+		gp2x_sound_write(PsndOut, len<<1);
 }
 
 
-static void SkipFrame(int do_sound)
+static void SkipFrame(int do_audio)
 {
-	void *sndbuff_tmp = 0;
-	if (PsndOut && !do_sound) {
-		sndbuff_tmp = PsndOut;
-		PsndOut = 0;
-	}
-
-	PicoSkipFrame=1;
+	PicoSkipFrame=do_audio ? 1 : 2;
 	PicoFrame();
 	PicoSkipFrame=0;
-
-	if (sndbuff_tmp && !do_sound) {
-		PsndOut = sndbuff_tmp;
-	}
 }
 
 
+void emu_forcedFrame(void)
+{
+	int po_old = PicoOpt;
+	int eo_old = currentConfig.EmuOpt;
+
+	PicoOpt &= ~0x0010;
+	PicoOpt |=  0x4080; // soft_scale | acc_sprites
+	currentConfig.EmuOpt |= 0x80;
+
+	//vidResetMode();
+	PicoDrawSetColorFormat(1);
+	PicoScan = EmuScan16;
+	PicoScan(0, 0);
+	Pico.m.dirtyPal = 1;
+	PicoFrameDrawOnly();
+
+/*
+	if (!(Pico.video.reg[12]&1)) {
+		vidCpyM2 = vidCpyM2_32col;
+		clearArea(1);
+	} else	vidCpyM2 = vidCpyM2_40col;
+
+	vidCpyM2((unsigned char *)gp2x_screen+320*8, PicoDraw2FB+328*8);
+	vidConvCpyRGB32(localPal, Pico.cram, 0x40);
+	gp2x_video_setpalette(localPal, 0x40);
+*/
+	PicoOpt = po_old;
+	currentConfig.EmuOpt = eo_old;
+}
+
 static void simpleWait(int thissec, int lim_time)
 {
 	struct timeval tval;
@@ -975,11 +664,11 @@ static void simpleWait(int thissec, int lim_time)
 void emu_Loop(void)
 {
 	static int gp2x_old_clock = 200;
-	static int PsndRate_old = 0, PicoOpt_old = 0, PsndLen_real = 0, pal_old = 0;
+	static int PsndRate_old = 0, PicoOpt_old = 0, EmuOpt_old = 0, pal_old = 0;
 	char fpsbuff[24]; // fps count c string
 	struct timeval tval; // timing
 	int thissec = 0, frames_done = 0, frames_shown = 0, oldmodes = 0;
-	int target_fps, target_frametime, lim_time, i;
+	int target_fps, target_frametime, lim_time, vsync_offset, i;
 	char *notice = 0;
 
 	printf("entered emu_Loop()\n");
@@ -991,18 +680,27 @@ void emu_Loop(void)
 		printf(" done\n");
 	}
 
-	if (gp2x_old_gamma != currentConfig.gamma) {
-		set_gamma(currentConfig.gamma);
+	if (gp2x_old_gamma != currentConfig.gamma || (EmuOpt_old&0x1000) != (currentConfig.EmuOpt&0x1000)) {
+		set_gamma(currentConfig.gamma, !!(currentConfig.EmuOpt&0x1000));
 		gp2x_old_gamma = currentConfig.gamma;
-		printf("updated gamma to %i\n", currentConfig.gamma);
+		printf("updated gamma to %i, A_SN's curve: %i\n", currentConfig.gamma, !!(currentConfig.EmuOpt&0x1000));
 	}
 
+	if ((EmuOpt_old&0x2000) != (currentConfig.EmuOpt&0x2000)) {
+		if (currentConfig.EmuOpt&0x2000)
+		     set_LCD_custom_rate(Pico.m.pal ? LCDR_100 : LCDR_120);
+		else unset_LCD_custom_rate();
+	}
+
+	EmuOpt_old = currentConfig.EmuOpt;
 	fpsbuff[0] = 0;
 
 	// make sure we are in correct mode
 	vidResetMode();
+	scaling_update();
+	Pico.m.dirtyPal = 1;
 	oldmodes = ((Pico.video.reg[12]&1)<<2) ^ 0xc;
-	find_combos();
+	emu_findKeyBindCombos();
 
 	// pal/ntsc might have changed, reset related stuff
 	target_fps = Pico.m.pal ? 50 : 60;
@@ -1010,46 +708,60 @@ void emu_Loop(void)
 	reset_timing = 1;
 
 	// prepare sound stuff
-	if(currentConfig.EmuOpt & 4) {
+	if (currentConfig.EmuOpt & 4)
+	{
 		int snd_excess_add;
-		if(PsndRate != PsndRate_old || (PicoOpt&0x20b) != (PicoOpt_old&0x20b) || Pico.m.pal != pal_old || crashed_940) {
-			/* if 940 is turned off, we need it to be put back to sleep */
-			if (!(PicoOpt&0x200) && ((PicoOpt^PicoOpt_old)&0x200)) {
-				Reset940(1, 2);
-				Pause940(1);
-			}
-			sound_rerate(1);
+		if (PsndRate != PsndRate_old || (PicoOpt&0x20b) != (PicoOpt_old&0x20b) || Pico.m.pal != pal_old ||
+				((PicoOpt&0x200) && crashed_940)) {
+			PsndRerate(Pico.m.frame_count ? 1 : 0);
 		}
-		//excess_samples = PsndRate - PsndLen*target_fps;
 		snd_excess_add = ((PsndRate - PsndLen*target_fps)<<16) / target_fps;
-		printf("starting audio: %i len: %i (ex: %04x) stereo: %i, pal: %i\n", PsndRate, PsndLen, snd_excess_add, (PicoOpt&8)>>3, Pico.m.pal);
+		printf("starting audio: %i len: %i (ex: %04x) stereo: %i, pal: %i\n",
+			PsndRate, PsndLen, snd_excess_add, (PicoOpt&8)>>3, Pico.m.pal);
 		gp2x_start_sound(PsndRate, 16, (PicoOpt&8)>>3);
 		gp2x_sound_volume(currentConfig.volume, currentConfig.volume);
 		PicoWriteSound = updateSound;
+		update_volume(0, 0);
 		memset(sndBuffer, 0, sizeof(sndBuffer));
 		PsndOut = sndBuffer;
 		PsndRate_old = PsndRate;
-		PsndLen_real = PsndLen;
 		PicoOpt_old  = PicoOpt;
 		pal_old = Pico.m.pal;
 	} else {
-		PsndOut = 0;
+		PsndOut = NULL;
 	}
 
+	// prepare CD buffer
+	if (PicoMCD & 1) PicoCDBufferInit();
+
+	// calc vsync offset to sync timing code with vsync
+	if (currentConfig.EmuOpt&0x2000) {
+		gettimeofday(&tval, 0);
+		gp2x_video_wait_vsync();
+		gettimeofday(&tval, 0);
+		vsync_offset = tval.tv_usec;
+		while (vsync_offset >= target_frametime)
+			vsync_offset -= target_frametime;
+		if (!vsync_offset) vsync_offset++;
+		printf("vsync_offset: %i\n", vsync_offset);
+	} else
+		vsync_offset = 0;
+
 	// loop?
 	while (engineState == PGS_Running)
 	{
 		int modes;
 
 		gettimeofday(&tval, 0);
-		if(reset_timing) {
+		if (reset_timing) {
 			reset_timing = 0;
 			thissec = tval.tv_sec;
 			frames_shown = frames_done = tval.tv_usec/target_frametime;
 		}
 
 		// show notice message?
-		if(noticeMsgTime.tv_sec) {
+		if (noticeMsgTime.tv_sec)
+		{
 			static int noticeMsgSum;
 			if((tval.tv_sec*1000000+tval.tv_usec) - (noticeMsgTime.tv_sec*1000000+noticeMsgTime.tv_usec) > 2000000) { // > 2.0 sec
 				noticeMsgTime.tv_sec = noticeMsgTime.tv_usec = 0;
@@ -1064,7 +776,8 @@ void emu_Loop(void)
 
 		// check for mode changes
 		modes = ((Pico.video.reg[12]&1)<<2)|(Pico.video.reg[1]&8);
-		if (modes != oldmodes) {
+		if (modes != oldmodes)
+		{
 			int scalex = 320;
 			osd_fps_x = OSD_FPS_X;
 			if (modes & 4) {
@@ -1078,16 +791,19 @@ void emu_Loop(void)
 					vidCpyM2 = vidCpyM2_32col;
 				}
 			}
-			gp2x_video_RGB_setscaling(scalex, 240);
+			if (currentConfig.scaling == 2 && !(modes&8)) // want vertical scaling and game is not in 240 line mode
+			     gp2x_video_RGB_setscaling(8, scalex, 224);
+			else gp2x_video_RGB_setscaling(0, scalex, 240);
 			oldmodes = modes;
 			clearArea(1);
 		}
 
 		// second changed?
-		if(thissec != tval.tv_sec) {
+		if (thissec != tval.tv_sec)
+		{
 #ifdef BENCHMARK
 			static int bench = 0, bench_fps = 0, bench_fps_s = 0, bfp = 0, bf[4];
-			if(++bench == 10) {
+			if (++bench == 10) {
 				bench = 0;
 				bench_fps_s = bench_fps;
 				bf[bfp++ & 3] = bench_fps;
@@ -1096,12 +812,13 @@ void emu_Loop(void)
 			bench_fps += frames_shown;
 			sprintf(fpsbuff, "%02i/%02i/%02i", frames_shown, bench_fps_s, (bf[0]+bf[1]+bf[2]+bf[3])>>2);
 #else
-			if(currentConfig.EmuOpt & 2)
+			if (currentConfig.EmuOpt & 2)
 				sprintf(fpsbuff, "%02i/%02i", frames_shown, frames_done);
+			if (fpsbuff[5] == 0) { fpsbuff[5] = fpsbuff[6] = ' '; fpsbuff[7] = 0; }
 #endif
 			thissec = tval.tv_sec;
 
-			if(PsndOut == 0 && currentConfig.Frameskip >= 0) {
+			if (PsndOut == 0 && currentConfig.Frameskip >= 0) {
 				frames_done = frames_shown = 0;
 			} else {
 				// it is quite common for this implementation to leave 1 fame unfinished
@@ -1116,13 +833,16 @@ void emu_Loop(void)
 				if (frames_shown > frames_done) frames_shown = frames_done;
 			}
 		}
+#ifdef PFRAMES
+		sprintf(fpsbuff, "%i", Pico.m.frame_count);
+#endif
 
-		lim_time = (frames_done+1) * target_frametime;
+		lim_time = (frames_done+1) * target_frametime + vsync_offset;
 		if(currentConfig.Frameskip >= 0) { // frameskip enabled
 			for(i = 0; i < currentConfig.Frameskip; i++) {
 				updateKeys();
 				SkipFrame(1); frames_done++;
-				if (PsndOut) { // do framelimitting if sound is enabled
+				if (PsndOut && !reset_timing) { // do framelimitting if sound is enabled
 					gettimeofday(&tval, 0);
 					if(thissec != tval.tv_sec) tval.tv_usec+=1000000;
 					if(tval.tv_usec < lim_time) { // we are too fast
@@ -1133,8 +853,14 @@ void emu_Loop(void)
 			}
 		} else if(tval.tv_usec > lim_time) { // auto frameskip
 			// no time left for this frame - skip
+			if (tval.tv_usec - lim_time >= 300000) {
+				/* something caused a slowdown for us (disk access? cache flush?)
+				 * try to recover by resetting timing... */
+				reset_timing = 1;
+				continue;
+			}
 			updateKeys();
-			SkipFrame(tval.tv_usec < lim_time+target_frametime); frames_done++;
+			SkipFrame(tval.tv_usec < lim_time+target_frametime*2); frames_done++;
 			continue;
 		}
 
@@ -1201,18 +927,24 @@ if (Pico.m.frame_count == 31563) {
 
 		// check time
 		gettimeofday(&tval, 0);
-		if(thissec != tval.tv_sec) tval.tv_usec+=1000000;
+		if (thissec != tval.tv_sec) tval.tv_usec+=1000000;
 
-		// sleep if we are still too fast
-		if(PsndOut != 0 || currentConfig.Frameskip < 0)
+		if (currentConfig.Frameskip < 0 && tval.tv_usec - lim_time >= 300000) // slowdown detection
+			reset_timing = 1;
+		else if (PsndOut != NULL || currentConfig.Frameskip < 0)
 		{
+			// sleep or vsync if we are still too fast
 			// usleep sleeps for ~20ms minimum, so it is not a solution here
-			gettimeofday(&tval, 0);
-			if(thissec != tval.tv_sec) tval.tv_usec+=1000000;
-			if(tval.tv_usec < lim_time)
+			if (!reset_timing && tval.tv_usec < lim_time)
 			{
 				// we are too fast
-				simpleWait(thissec, lim_time);
+				if (vsync_offset) {
+					if (lim_time - tval.tv_usec > target_frametime/2)
+						simpleWait(thissec, lim_time - target_frametime/4);
+					gp2x_video_wait_vsync();
+				} else {
+					simpleWait(thissec, lim_time);
+				}
 			}
 		}
 
@@ -1221,12 +953,20 @@ if (Pico.m.frame_count == 31563) {
 		frames_done++; frames_shown++;
 	}
 
+	change_fast_forward(0);
+
+	if (PicoMCD & 1) PicoCDBufferFree();
+
 	// save SRAM
 	if((currentConfig.EmuOpt & 1) && SRam.changed) {
-		blit("", "Writing SRAM/BRAM..");
+		emu_state_cb("Writing SRAM/BRAM..");
 		emu_SaveLoadGame(0, 1);
 		SRam.changed = 0;
 	}
+
+	// if in 8bit mode, generate 16bit image for menu background
+	if ((PicoOpt&0x10) || !(currentConfig.EmuOpt&0x80))
+		emu_forcedFrame();
 }
 
 
@@ -1237,110 +977,3 @@ void emu_ResetGame(void)
 }
 
 
-size_t gzRead2(void *p, size_t _size, size_t _n, void *file)
-{
-	return gzread(file, p, _n);
-}
-
-
-size_t gzWrite2(void *p, size_t _size, size_t _n, void *file)
-{
-	return gzwrite(file, p, _n);
-}
-
-
-int emu_SaveLoadGame(int load, int sram)
-{
-	int ret = 0;
-	char saveFname[512];
-
-	// make save filename
-	romfname_ext(saveFname, "");
-	if(sram) strcat(saveFname, (PicoMCD&1) ? ".brm" : ".srm");
-	else {
-		if(state_slot > 0 && state_slot < 10) sprintf(saveFname, "%s.%i", saveFname, state_slot);
-		strcat(saveFname, ".mds");
-	}
-
-	printf("saveLoad (%i, %i): %s\n", load, sram, saveFname);
-
-	if(sram) {
-		FILE *sramFile;
-		int sram_size;
-		unsigned char *sram_data;
-		if (PicoMCD&1) {
-			sram_size = 0x2000;
-			sram_data = Pico_mcd->bram;
-		} else {
-			sram_size = SRam.end-SRam.start+1;
-			if(SRam.reg_back & 4) sram_size=0x2000;
-			sram_data = SRam.data;
-		}
-		if(!sram_data) return 0; // SRam forcefully disabled for this game
-
-		if(load) {
-			sramFile = fopen(saveFname, "rb");
-			if(!sramFile) return -1;
-			fread(sram_data, 1, sram_size, sramFile);
-			fclose(sramFile);
-		} else {
-			// sram save needs some special processing
-			// see if we have anything to save
-			for(; sram_size > 0; sram_size--)
-				if(sram_data[sram_size-1]) break;
-
-			if(sram_size) {
-				sramFile = fopen(saveFname, "wb");
-				ret = fwrite(sram_data, 1, sram_size, sramFile);
-				ret = (ret != sram_size) ? -1 : 0;
-				fclose(sramFile);
-				sync();
-			}
-		}
-		return ret;
-	}
-	else
-	{
-		void *PmovFile = NULL;
-		// try gzip first
-		if(currentConfig.EmuOpt & 8) {
-			strcat(saveFname, ".gz");
-			if( (PmovFile = gzopen(saveFname, load ? "rb" : "wb")) ) {
-				areaRead  = gzRead2;
-				areaWrite = gzWrite2;
-				areaEof   = (areaeof *) gzeof;
-				areaSeek  = (areaseek *) gzseek;
-				if(!load) gzsetparams(PmovFile, 9, Z_DEFAULT_STRATEGY);
-			} else
-				saveFname[strlen(saveFname)-3] = 0;
-		}
-		if(!PmovFile) { // gzip failed or was disabled
-			if( (PmovFile = fopen(saveFname, load ? "rb" : "wb")) ) {
-				areaRead  = (arearw *) fread;
-				areaWrite = (arearw *) fwrite;
-				areaEof   = (areaeof *) feof;
-				areaSeek  = (areaseek *) fseek;
-			}
-		}
-		if(PmovFile) {
-			ret = PmovState(load ? 6 : 5, PmovFile);
-			if(areaRead == gzRead2)
-				 gzclose(PmovFile);
-			else fclose ((FILE *) PmovFile);
-			PmovFile = 0;
-			if (!load) sync();
-			else Pico.m.dirtyPal=1;
-		}
-		else	ret = -1;
-		if (!ret)
-			strcpy(noticeMsg, load ? "GAME LOADED  " : "GAME SAVED   ");
-		else
-		{
-			strcpy(noticeMsg, load ? "LOAD FAILED  " : "SAVE FAILED  ");
-			ret = -1;
-		}
-
-		gettimeofday(&noticeMsgTime, 0);
-		return ret;
-	}
-}