X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=gp2x%2Femu.c;h=adb10a351ef4c71614afea976e9259038a6f62e8;hb=c7a4ff64287b12487c7e9cc13ce3b7d2aa6e1f06;hp=dcc8f6e16b99ad3b4d951dc2474183384eaf5dd1;hpb=598e7c06cd865f9c4f82e3ebb9b08e8b064f00e8;p=libpicofe.git

diff --git a/gp2x/emu.c b/gp2x/emu.c
index dcc8f6e..adb10a3 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,11 +18,13 @@
 #include "gp2x.h"
 #include "usbjoy.h"
 #include "menu.h"
-#include "asmutils.h"
+#include "../common/arm_utils.h"
+#include "../common/fonts.h"
 #include "cpuctrl.h"
 
-#include "Pico/PicoInt.h"
-#include "zlib/zlib.h"
+#include <Pico/PicoInt.h>
+#include <Pico/Patch.h>
+#include <zlib/zlib.h>
 
 
 #ifdef BENCHMARK
@@ -29,14 +33,6 @@
 #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;
@@ -48,31 +44,20 @@ unsigned char *rom_data = NULL;
 
 extern int crashed_940;
 
+static short sndBuffer[2*44100/50];
 static char noticeMsg[64];					// notice msg to draw
 static struct timeval noticeMsgTime = { 0, 0 };	// when started showing
-static int reset_timing, osd_fps_x;
+static int osd_fps_x;
 static int combo_keys = 0, combo_acts = 0;	// keys and actions which need button combos
 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
+unsigned char *PicoDraw2FB = NULL;  // temporary buffer for alt renderer
 int state_slot = 0;
+int reset_timing = 0;
+int config_slot = 0, config_slot_current = 0;
 
-/*
-// tmp
-static FILE *logf = NULL;
-
-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)
 {
@@ -165,31 +150,31 @@ int find_bios(int region, char **bios_file)
 
 /* checks if romFileName points to valid MegaCD image
  * if so, checks for suitable BIOS */
-static int cd_check(char *ext, char **bios_file)
+int emu_cd_check(char **bios_file)
 {
 	unsigned char buf[32];
-	FILE *cd_f;
+	pm_file *cd_f;
 	int type = 0, region = 4; // 1: Japan, 4: US, 8: Europe
 
-	cd_f = fopen(romFileName, "rb");
+	cd_f = pm_open(romFileName);
 	if (!cd_f) return 0; // let the upper level handle this
 
-	if (fread(buf, 1, 32, cd_f) != 32) {
-		fclose(cd_f);
+	if (pm_read(buf, 32, cd_f) != 32) {
+		pm_close(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);
+		pm_close(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);
+	/* it seems we have a CD image here. Try to detect region now.. */
+	pm_seek(cd_f, (type == 1) ? 0x100+0x10B : 0x110+0x10B, SEEK_SET);
+	pm_read(buf, 1, cd_f);
+	pm_close(cd_f);
 
 	if (buf[0] == 0x64) region = 8; // EU
 	if (buf[0] == 0xa1) region = 1; // JAP
@@ -202,7 +187,9 @@ static int cd_check(char *ext, char **bios_file)
 		printf("overrided region to %s\n", region != 4 ? (region == 8 ? "EU" : "JAP") : "USA");
 	}
 
-	if(find_bios(region, bios_file))
+	if (bios_file == NULL) return type;
+
+	if (find_bios(region, bios_file))
 		 return type;	// CD and BIOS detected
 
 	return -1;     		// CD detected but load failed
@@ -213,7 +200,7 @@ int emu_ReloadRom(void)
 	unsigned int rom_size = 0;
 	char *used_rom_name = romFileName;
 	char ext[5];
-	FILE *rom;
+	pm_file *rom;
 	int ret, cd_state;
 
 	printf("emu_ReloadRom(%s)\n", romFileName);
@@ -226,6 +213,8 @@ int emu_ReloadRom(void)
 		return 0;
 	}
 
+	PicoPatchUnload();
+
 	// check for movie file
 	if(movie_data) {
 		free(movie_data);
@@ -266,9 +255,22 @@ int emu_ReloadRom(void)
 		}
 		get_ext(romFileName, ext);
 	}
+	else if (!strcmp(ext, ".pat")) {
+		int dummy;
+		PicoPatchLoad(romFileName);
+		dummy = try_rfn_cut() || try_rfn_cut();
+		if (!dummy) {
+			sprintf(menuErrorMsg, "Could't find a ROM to patch.");
+			return 0;
+		}
+		get_ext(romFileName, ext);
+	}
+
+	if ((PicoMCD & 1) && Pico_mcd != NULL)
+		Stop_CD();
 
 	// check for MegaCD image
-	cd_state = cd_check(ext, &used_rom_name);
+	cd_state = emu_cd_check(&used_rom_name);
 	if (cd_state > 0) {
 		PicoMCD |= 1;
 		get_ext(used_rom_name, ext);
@@ -276,44 +278,37 @@ int emu_ReloadRom(void)
 		// bios_help() ?
 		return 0;
 	} else {
+		if (PicoMCD & 1) Stop_CD();
 		PicoMCD &= ~1;
 	}
 
-	rom = fopen(used_rom_name, "rb");
+	rom = pm_open(used_rom_name);
 	if(!rom) {
 		sprintf(menuErrorMsg, "Failed to open rom.");
 		return 0;
 	}
 
+	menu_romload_prepare(used_rom_name);
+
 	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);
+	if( (ret = PicoCartLoad(rom, &rom_data, &rom_size)) ) {
+		sprintf(menuErrorMsg, "PicoCartLoad() failed.");
+		printf("%s\n", menuErrorMsg);
+		pm_close(rom);
+		menu_romload_end();
+		return 0;
 	}
+	pm_close(rom);
+	menu_romload_end();
 
 	// 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) {
+	  ((*(unsigned char *)(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.");
@@ -321,9 +316,9 @@ int emu_ReloadRom(void)
 	}
 
 	// load config for this ROM (do this before insert to get correct region)
-	ret = emu_ReadConfig(1);
+	ret = emu_ReadConfig(1, 1);
 	if (!ret)
-		emu_ReadConfig(0);
+		emu_ReadConfig(0, 1);
 
 	printf("PicoCartInsert(%p, %d);\n", rom_data, rom_size);
 	if(PicoCartInsert(rom_data, rom_size)) {
@@ -347,6 +342,11 @@ int emu_ReloadRom(void)
 	strncpy(currentConfig.lastRomFile, romFileName, sizeof(currentConfig.lastRomFile)-1);
 	currentConfig.lastRomFile[sizeof(currentConfig.lastRomFile)-1] = 0;
 
+	if (PicoPatches) {
+		PicoPatchPrepare();
+		PicoPatchApply();
+	}
+
 	// additional movie stuff
 	if(movie_data) {
 		if(movie_data[0x14] == '6')
@@ -374,7 +374,7 @@ int emu_ReloadRom(void)
 		}
 	}
 	gettimeofday(&noticeMsgTime, 0);
-printf("PicoMCD: %x\n", PicoMCD);
+
 	// load SRAM for this ROM
 	if(currentConfig.EmuOpt & 1)
 		emu_SaveLoadGame(1, 1);
@@ -383,31 +383,47 @@ printf("PicoMCD: %x\n", PicoMCD);
 }
 
 
+static void emu_msg_cb(const char *msg);
+static void emu_msg_tray_open(void);
+
 void emu_Init(void)
 {
 	// make temp buffer for alt renderer
-	framebuff = malloc((8+320)*(8+240+8));
-	if (!framebuff)
+	PicoDraw2FB = malloc((8+320)*(8+240+8));
+	if (!PicoDraw2FB)
 	{
-		printf("framebuff == 0\n");
+		printf("PicoDraw2FB == 0\n");
 	}
 
-	PicoInit();
+	// make dirs for saves, cfgs, etc.
+	mkdir("mds", 0777);
+	mkdir("srm", 0777);
+	mkdir("brm", 0777);
+	mkdir("cfg", 0777);
 
-//	logf = fopen("log.txt", "w");
+	PicoInit();
+	PicoMessage = emu_msg_cb;
+	PicoMCDopenTray = emu_msg_tray_open;
+	PicoMCDcloseTray = menu_loop_tray;
 }
 
 
-static void romfname_ext(char *dst, char *ext)
+static void romfname_ext(char *dst, const char *prefix, const char *ext)
 {
 	char *p;
+	int prefix_len = 0;
 
 	// make save filename
 	for (p = romFileName+strlen(romFileName)-1; p >= romFileName && *p != '/'; p--); p++;
-	strncpy(dst, p, 511);
+	*dst = 0;
+	if (prefix) {
+		strcpy(dst, prefix);
+		prefix_len = strlen(prefix);
+	}
+	strncpy(dst + prefix_len, p, 511-prefix_len);
 	dst[511-8] = 0;
-	if(dst[strlen(dst)-4] == '.') dst[strlen(dst)-4] = 0;
-	strcat(dst, ext);
+	if (dst[strlen(dst)-4] == '.') dst[strlen(dst)-4] = 0;
+	if (ext) strcat(dst, ext);
 }
 
 
@@ -441,42 +457,73 @@ static void find_combos(void)
 }
 
 
-int emu_ReadConfig(int game)
+void scaling_update(void)
+{
+	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
+	}
+}
+
+
+int emu_ReadConfig(int game, int no_defaults)
 {
 	FILE *f;
-	char cfg[512];
+	char cfg[512], extbuf[16];
 	int bread = 0;
 
 	if (!game)
 	{
-		// set default config
-		memset(&currentConfig, 0, sizeof(currentConfig));
-		currentConfig.lastRomFile[0] = 0;
-		currentConfig.EmuOpt  = 0x1f | 0xc00; // | cd_leds | cd_cdda
-		currentConfig.PicoOpt = 0x0f | 0x200; // | use_940
-		currentConfig.PsndRate = 44100;
-		currentConfig.PicoRegion = 0; // auto
-		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;
+		if (!no_defaults)
+		{
+			// set default config
+			memset(&currentConfig, 0, sizeof(currentConfig));
+			currentConfig.lastRomFile[0] = 0;
+			currentConfig.EmuOpt  = 0x1f | 0x600; // | confirm_save, 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;
+			currentConfig.PicoCDBuffers = 64;
+			currentConfig.scaling = 0;
+		}
 		strncpy(cfg, PicoConfigFile, 511);
+		if (config_slot != 0)
+		{
+			char *p = strrchr(cfg, '.');
+			if (p == NULL) p = cfg + strlen(cfg);
+			sprintf(extbuf, ".%i.pbcfg", config_slot);
+			strncpy(p, extbuf, 511 - (p - cfg));
+		}
 		cfg[511] = 0;
 	} else {
-		romfname_ext(cfg, ".pbcfg");
+		if (config_slot != 0)
+		     sprintf(extbuf, ".%i.pbcfg", config_slot);
+		else strcpy(extbuf, ".pbcfg");
+		romfname_ext(cfg, "cfg/", extbuf);
+		f = fopen(cfg, "rb");
+		if (!f) romfname_ext(cfg, NULL, ".pbcfg");
+		else fclose(f);
 	}
 
 	printf("emu_ReadConfig: %s ", cfg);
@@ -485,40 +532,51 @@ int emu_ReadConfig(int game)
 		bread = fread(&currentConfig, 1, sizeof(currentConfig), f);
 		fclose(f);
 	}
-	printf((bread == sizeof(currentConfig)) ? "(ok)\n" : "(failed)\n");
+	printf(bread > 0 ? "(ok)\n" : "(failed)\n");
 
 	PicoOpt = currentConfig.PicoOpt;
 	PsndRate = currentConfig.PsndRate;
 	PicoRegionOverride = currentConfig.PicoRegion;
-	if (PicoOpt & 0x20) {
-		actionNames[ 8] = "Z"; actionNames[ 9] = "Y";
-		actionNames[10] = "X"; actionNames[11] = "MODE";
-	}
+	PicoAutoRgnOrder = currentConfig.PicoAutoRgnOrder;
+	PicoCDBuffers = currentConfig.PicoCDBuffers;
+	scaling_update();
 	// some sanity checks
-	if (currentConfig.CPUclock < 1 || currentConfig.CPUclock > 4096) currentConfig.CPUclock = 200;
+	if (currentConfig.CPUclock < 10 || currentConfig.CPUclock > 4096) currentConfig.CPUclock = 200;
 	if (currentConfig.gamma < 10 || currentConfig.gamma > 300) currentConfig.gamma = 100;
+	if (currentConfig.volume < 0 || currentConfig.volume > 99) currentConfig.volume = 50;
 	// 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));
+	if (bread > 0) config_slot_current = config_slot;
+	return (bread > 0); // == sizeof(currentConfig));
 }
 
 
 int emu_WriteConfig(int game)
 {
 	FILE *f;
-	char cfg[512];
+	char cfg[512], extbuf[16];
 	int bwrite = 0;
 
 	if (!game)
 	{
 		strncpy(cfg, PicoConfigFile, 511);
+		if (config_slot != 0)
+		{
+			char *p = strrchr(cfg, '.');
+			if (p == NULL) p = cfg + strlen(cfg);
+			sprintf(extbuf, ".%i.pbcfg", config_slot);
+			strncpy(p, extbuf, 511 - (p - cfg));
+		}
 		cfg[511] = 0;
 	} else {
-		romfname_ext(cfg, ".pbcfg");
+		if (config_slot != 0)
+		     sprintf(extbuf, ".%i.pbcfg", config_slot);
+		else strcpy(extbuf, ".pbcfg");
+		romfname_ext(cfg, "cfg/", extbuf);
 	}
 
 	printf("emu_WriteConfig: %s ", cfg);
@@ -527,13 +585,18 @@ int emu_WriteConfig(int game)
 		currentConfig.PicoOpt = PicoOpt;
 		currentConfig.PsndRate = PsndRate;
 		currentConfig.PicoRegion = PicoRegionOverride;
+		currentConfig.PicoAutoRgnOrder = PicoAutoRgnOrder;
+		currentConfig.PicoCDBuffers = PicoCDBuffers;
 		bwrite = fwrite(&currentConfig, 1, sizeof(currentConfig), f);
 		fflush(f);
 		fclose(f);
+#ifndef NO_SYNC
 		sync();
+#endif
 	}
 	printf((bwrite == sizeof(currentConfig)) ? "(ok)\n" : "(failed)\n");
 
+	if (bwrite == sizeof(currentConfig)) config_slot_current = config_slot;
 	return (bwrite == sizeof(currentConfig));
 }
 
@@ -546,20 +609,81 @@ void emu_Deinit(void)
 		SRam.changed = 0;
 	}
 
-	if (!(currentConfig.EmuOpt & 0x20))
-		emu_WriteConfig(0);
-	free(framebuff);
+	if (!(currentConfig.EmuOpt & 0x20)) {
+		FILE *f = fopen(PicoConfigFile, "r+b");
+		if (!f) emu_WriteConfig(0);
+		else {
+			// if we already have config, reload it, except last ROM
+			fseek(f, sizeof(currentConfig.lastRomFile), SEEK_SET);
+			fread(&currentConfig.EmuOpt, 1, sizeof(currentConfig) - sizeof(currentConfig.lastRomFile), f);
+			fseek(f, 0, SEEK_SET);
+			fwrite(&currentConfig, 1, sizeof(currentConfig), f);
+			fflush(f);
+			fclose(f);
+#ifndef NO_SYNC
+			sync();
+#endif
+		}
+	}
+
+	free(PicoDraw2FB);
 
 	PicoExit();
-//	fclose(logf);
 
 	// restore gamma
 	if (gp2x_old_gamma != 100)
-		set_gamma(100);
+		set_gamma(100, 0);
+}
+
+static void text_out8_builtin(int x, int y, const char *text)
+{
+	int i,l,len=strlen(text);
+	unsigned char *screen = (unsigned char *)gp2x_screen + x + y*320;
+
+	/* always using built-in font */
+	for (i = 0; i < len; i++)
+	{
+		for (l=0;l<8;l++)
+		{
+			unsigned char fd = fontdata8x8[((text[i])*8)+l];
+			if (fd&0x80) screen[l*320+0]=0xf0;
+			if (fd&0x40) screen[l*320+1]=0xf0;
+			if (fd&0x20) screen[l*320+2]=0xf0;
+			if (fd&0x10) screen[l*320+3]=0xf0;
+			if (fd&0x08) screen[l*320+4]=0xf0;
+			if (fd&0x04) screen[l*320+5]=0xf0;
+			if (fd&0x02) screen[l*320+6]=0xf0;
+			if (fd&0x01) screen[l*320+7]=0xf0;
+		}
+		screen += 8;
+	}
+}
+
+static void text_out16_builtin(int x, int y, const char *text)
+{
+	int i,l,len=strlen(text);
+	unsigned short *screen = (unsigned short *)gp2x_screen + x + y*320;
+
+	for (i = 0; i < len; i++)
+	{
+		for (l=0;l<8;l++)
+		{
+			unsigned char fd = fontdata8x8[((text[i])*8)+l];
+			if(fd&0x80) screen[l*320+0]=0xffff;
+			if(fd&0x40) screen[l*320+1]=0xffff;
+			if(fd&0x20) screen[l*320+2]=0xffff;
+			if(fd&0x10) screen[l*320+3]=0xffff;
+			if(fd&0x08) screen[l*320+4]=0xffff;
+			if(fd&0x04) screen[l*320+5]=0xffff;
+			if(fd&0x02) screen[l*320+6]=0xffff;
+			if(fd&0x01) screen[l*320+7]=0xffff;
+		}
+		screen += 8;
+	}
 }
 
 
-void osd_text(int x, int y, char *text)
+void osd_text(int x, int y, const char *text)
 {
 	int len = strlen(text)*8;
 
@@ -571,7 +695,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);
+		text_out8_builtin(x, y, text);
 	} else {
 		int *p, i, h;
 		x &= ~1; // align x
@@ -580,7 +704,7 @@ 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);
+		text_out16_builtin(x, y, text);
 	}
 }
 
@@ -596,20 +720,20 @@ static void cd_leds(void)
 		// 8-bit modes
 		unsigned int col_g = (old_reg & 2) ? 0xc0c0c0c0 : 0xe0e0e0e0;
 		unsigned int col_r = (old_reg & 1) ? 0xd0d0d0d0 : 0xe0e0e0e0;
-		*(unsigned int *)((char *)gp2x_screen + 320*2+306) =
-		*(unsigned int *)((char *)gp2x_screen + 320*3+306) =
-		*(unsigned int *)((char *)gp2x_screen + 320*4+306) = col_g;
-		*(unsigned int *)((char *)gp2x_screen + 320*2+312) =
-		*(unsigned int *)((char *)gp2x_screen + 320*3+312) =
-		*(unsigned int *)((char *)gp2x_screen + 320*4+312) = col_r;
+		*(unsigned int *)((char *)gp2x_screen + 320*2+ 4) =
+		*(unsigned int *)((char *)gp2x_screen + 320*3+ 4) =
+		*(unsigned int *)((char *)gp2x_screen + 320*4+ 4) = col_g;
+		*(unsigned int *)((char *)gp2x_screen + 320*2+12) =
+		*(unsigned int *)((char *)gp2x_screen + 320*3+12) =
+		*(unsigned int *)((char *)gp2x_screen + 320*4+12) = col_r;
 	} else {
 		// 16-bit modes
-		unsigned int *p = (unsigned int *)((short *)gp2x_screen + 320*2+306);
+		unsigned int *p = (unsigned int *)((short *)gp2x_screen + 320*2+4);
 		unsigned int col_g = (old_reg & 2) ? 0x06000600 : 0;
 		unsigned int col_r = (old_reg & 1) ? 0xc000c000 : 0;
-		*p++ = col_g; *p++ = col_g; p++; *p++ = col_r; *p++ = col_r; p += 320/2 - 10/2;
-		*p++ = col_g; *p++ = col_g; p++; *p++ = col_r; *p++ = col_r; p += 320/2 - 10/2;
-		*p++ = col_g; *p++ = col_g; p++; *p++ = col_r; *p++ = col_r; p += 320/2 - 10/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; p += 320/2 - 12/2;
 	}
 }
 
@@ -629,10 +753,10 @@ 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;
 
@@ -644,7 +768,7 @@ 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);
+		vidCpyM2((unsigned char *)gp2x_screen+320*8, PicoDraw2FB+328*8);
 	} else if (!(emu_opt&0x80)) {
 		// 8bit accurate renderer
 		if (Pico.m.dirtyPal) {
@@ -671,9 +795,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();
 
@@ -714,7 +842,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);
@@ -736,44 +864,64 @@ 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;
 
-	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");
+	/* assumption: emu_msg_cb gets called only when something slow is about to happen */
+	reset_timing = 1;
+}
 
-	romfname_ext(saveFname, ext);
-	if ((f = fopen(saveFname, "rb"))) {
-		fclose(f);
-		return 1;
-	}
-	return 0;
+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 RunEvents(unsigned int which)
 {
 	if(which & 0x1800) { // save or load (but not both)
 		int do_it = 1;
-		if (!(which & 0x1000) && (currentConfig.EmuOpt & 0x200) && check_save_file()) {
+		if ( emu_check_save_file(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;
@@ -803,7 +951,7 @@ 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_check_save_file(state_slot) ? "USED" : "FREE");
 		gettimeofday(&noticeMsgTime, 0);
 	}
 	if(which & 0x0080) {
@@ -906,7 +1054,7 @@ static void updateKeys(void)
 	if(events & 0x6000) {
 		int vol = currentConfig.volume;
 		if (events & 0x2000) {
-			if (vol < 90) vol++;
+			if (vol < 99) vol++;
 		} else {
 			if (vol >  0) vol--;
 		}
@@ -923,47 +1071,55 @@ static void updateKeys(void)
 	prevEvents = (allActions[0] | allActions[1]) >> 16;
 }
 
-static int snd_excess_add = 0, snd_excess_cnt = 0; // hack
 
-static void updateSound(void)
+static void updateSound(int len)
 {
-	int len = (PicoOpt&8)?PsndLen*2:PsndLen;
-
-	snd_excess_cnt += snd_excess_add;
-	if (snd_excess_cnt >= 0x10000) {
-		snd_excess_cnt -= 0x10000;
-		if (PicoOpt&8) {
-			PsndOut[len]   = PsndOut[len-2];
-			PsndOut[len+1] = PsndOut[len-1];
-			len+=2;
-		} else {
-			PsndOut[len]   = PsndOut[len-1];
-			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_forced_frame(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;
@@ -984,11 +1140,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, PsndLen_real = 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");
@@ -1000,16 +1156,24 @@ 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();
+	Pico.m.dirtyPal = 1;
 	oldmodes = ((Pico.video.reg[12]&1)<<2) ^ 0xc;
 	find_combos();
 
@@ -1020,22 +1184,23 @@ void emu_Loop(void)
 
 	// prepare sound stuff
 	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();
+			sound_rerate(1);
 		}
 		//excess_samples = PsndRate - PsndLen*target_fps;
-		snd_excess_cnt = 0;
 		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);
 		gp2x_start_sound(PsndRate, 16, (PicoOpt&8)>>3);
 		gp2x_sound_volume(currentConfig.volume, currentConfig.volume);
 		PicoWriteSound = updateSound;
-		PsndOut = calloc((PicoOpt&8) ? (PsndLen*4+4) : (PsndLen*2+2), 1);
+		memset(sndBuffer, 0, sizeof(sndBuffer));
+		PsndOut = sndBuffer;
 		PsndRate_old = PsndRate;
 		PsndLen_real = PsndLen;
 		PicoOpt_old  = PicoOpt;
@@ -1044,6 +1209,22 @@ void emu_Loop(void)
 		PsndOut = 0;
 	}
 
+	// 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)
 	{
@@ -1086,7 +1267,9 @@ 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);
 		}
@@ -1125,7 +1308,7 @@ void emu_Loop(void)
 			}
 		}
 
-		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();
@@ -1141,8 +1324,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 >= 0x300000) {
+				/* 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;
 		}
 
@@ -1209,18 +1398,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 >= 0x300000) // 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)
 			{
 				// 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);
+				}
 			}
 		}
 
@@ -1229,16 +1424,19 @@ if (Pico.m.frame_count == 31563) {
 		frames_done++; frames_shown++;
 	}
 
+
+	if (PicoMCD & 1) PicoCDBufferFree();
+
 	// save SRAM
 	if((currentConfig.EmuOpt & 1) && SRam.changed) {
+		emu_state_cb("Writing SRAM/BRAM..");
 		emu_SaveLoadGame(0, 1);
 		SRam.changed = 0;
 	}
 
-	if (PsndOut != 0) {
-		free(PsndOut);
-		PsndOut = 0;
-	}
+	// if in 8bit mode, generate 16bit image for menu background
+	if ((PicoOpt&0x10) || !(currentConfig.EmuOpt&0x80))
+		emu_forced_frame();
 }
 
 
@@ -1260,19 +1458,97 @@ size_t gzWrite2(void *p, size_t _size, size_t _n, void *file)
 	return gzwrite(file, p, _n);
 }
 
-typedef unsigned int (*STATE_SL_FUNC)(void *, unsigned int, unsigned int, void *);
+static int try_ropen_file(const char *fname)
+{
+	FILE *f;
+
+	f = fopen(fname, "rb");
+	if (f) {
+		fclose(f);
+		return 1;
+	}
+	return 0;
+}
+
+char *emu_GetSaveFName(int load, int is_sram, int slot)
+{
+	static char saveFname[512];
+	char ext[16];
+
+	if (is_sram)
+	{
+		romfname_ext(saveFname, (PicoMCD&1) ? "brm/" : "srm/", (PicoMCD&1) ? ".brm" : ".srm");
+		if (load) {
+			if (try_ropen_file(saveFname)) return saveFname;
+			// try in current dir..
+			romfname_ext(saveFname, NULL, (PicoMCD&1) ? ".brm" : ".srm");
+			if (try_ropen_file(saveFname)) return saveFname;
+			return NULL; // give up
+		}
+	}
+	else
+	{
+		ext[0] = 0;
+		if(slot > 0 && slot < 10) sprintf(ext, ".%i", slot);
+		strcat(ext, (currentConfig.EmuOpt & 8) ? ".mds.gz" : ".mds");
+
+		romfname_ext(saveFname, "mds/", ext);
+		if (load) {
+			if (try_ropen_file(saveFname)) return saveFname;
+			romfname_ext(saveFname, NULL, ext);
+			if (try_ropen_file(saveFname)) return saveFname;
+			if (currentConfig.EmuOpt & 8) {
+				ext[0] = 0;
+				if(slot > 0 && slot < 10) sprintf(ext, ".%i", slot);
+				strcat(ext, ".mds");
+
+				romfname_ext(saveFname, "mds/", ext);
+				if (try_ropen_file(saveFname)) return saveFname;
+				romfname_ext(saveFname, NULL, ext);
+				if (try_ropen_file(saveFname)) return saveFname;
+			}
+			return NULL;
+		}
+	}
+
+	return saveFname;
+}
+
+int emu_check_save_file(int slot)
+{
+	return emu_GetSaveFName(1, 0, slot) ? 1 : 0;
+}
+
+void emu_set_save_cbs(int gz)
+{
+	if (gz) {
+		areaRead  = gzRead2;
+		areaWrite = gzWrite2;
+		areaEof   = (areaeof *) gzeof;
+		areaSeek  = (areaseek *) gzseek;
+		areaClose = (areaclose *) gzclose;
+	} else {
+		areaRead  = (arearw *) fread;
+		areaWrite = (arearw *) fwrite;
+		areaEof   = (areaeof *) feof;
+		areaSeek  = (areaseek *) fseek;
+		areaClose = (areaclose *) fclose;
+	}
+}
 
 int emu_SaveLoadGame(int load, int sram)
 {
 	int ret = 0;
-	char saveFname[512];
+	char *saveFname;
 
 	// 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");
+	saveFname = emu_GetSaveFName(load, sram, state_slot);
+	if (saveFname == NULL) {
+		if (!sram) {
+			strcpy(noticeMsg, load ? "LOAD FAILED (missing file)" : "SAVE FAILED  ");
+			gettimeofday(&noticeMsgTime, 0);
+		}
+		return -1;
 	}
 
 	printf("saveLoad (%i, %i): %s\n", load, sram, saveFname);
@@ -1281,33 +1557,48 @@ int emu_SaveLoadGame(int load, int sram)
 		FILE *sramFile;
 		int sram_size;
 		unsigned char *sram_data;
+		int truncate = 1;
 		if (PicoMCD&1) {
-			sram_size = 0x2000;
-			sram_data = Pico_mcd->bram;
+			if (PicoOpt&0x8000) { // MCD RAM cart?
+				sram_size = 0x12000;
+				sram_data = SRam.data;
+				if (sram_data)
+					memcpy32((int *)sram_data, (int *)Pico_mcd->bram, 0x2000/4);
+			} else {
+				sram_size = 0x2000;
+				sram_data = Pico_mcd->bram;
+				truncate  = 0; // the .brm may contain RAM cart data after normal brm
+			}
 		} 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 (!sram_data) return 0; // SRam forcefully disabled for this game
 
-		if(load) {
+		if (load) {
 			sramFile = fopen(saveFname, "rb");
 			if(!sramFile) return -1;
 			fread(sram_data, 1, sram_size, sramFile);
 			fclose(sramFile);
+			if ((PicoMCD&1) && (PicoOpt&0x8000))
+				memcpy32((int *)Pico_mcd->bram, (int *)sram_data, 0x2000/4);
 		} 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;
+			for (; sram_size > 0; sram_size--)
+				if (sram_data[sram_size-1]) break;
 
-			if(sram_size) {
-				sramFile = fopen(saveFname, "wb");
+			if (sram_size) {
+				sramFile = fopen(saveFname, truncate ? "wb" : "r+b");
+				if (!sramFile) sramFile = fopen(saveFname, "wb"); // retry
+				if (!sramFile) return -1;
 				ret = fwrite(sram_data, 1, sram_size, sramFile);
 				ret = (ret != sram_size) ? -1 : 0;
 				fclose(sramFile);
+#ifndef NO_SYNC
 				sync();
+#endif
 			}
 		}
 		return ret;
@@ -1315,32 +1606,32 @@ int emu_SaveLoadGame(int load, int sram)
 	else
 	{
 		void *PmovFile = NULL;
-		// try gzip first
-		if(currentConfig.EmuOpt & 8) {
-			strcat(saveFname, ".gz");
+		if (strcmp(saveFname + strlen(saveFname) - 3, ".gz") == 0) {
 			if( (PmovFile = gzopen(saveFname, load ? "rb" : "wb")) ) {
-				areaRead  = gzRead2;
-				areaWrite = gzWrite2;
+				emu_set_save_cbs(1);
 				if(!load) gzsetparams(PmovFile, 9, Z_DEFAULT_STRATEGY);
-			} else
-				saveFname[strlen(saveFname)-3] = 0;
+			}
 		}
-		if(!PmovFile) { // gzip failed or was disabled
+		else
+		{
 			if( (PmovFile = fopen(saveFname, load ? "rb" : "wb")) ) {
-				areaRead  = (STATE_SL_FUNC) fread;
-				areaWrite = (STATE_SL_FUNC) fwrite;
+				emu_set_save_cbs(0);
 			}
 		}
 		if(PmovFile) {
-			PmovState(load ? 6 : 5, PmovFile);
-			strcpy(noticeMsg, load ? "GAME LOADED  " : "GAME SAVED   ");
-			if(areaRead == gzRead2)
-				 gzclose(PmovFile);
-			else fclose ((FILE *) PmovFile);
+			ret = PmovState(load ? 6 : 5, PmovFile);
+			areaClose(PmovFile);
 			PmovFile = 0;
-			if (!load) sync();
-			else Pico.m.dirtyPal=1;
-		} else {
+			if (load) Pico.m.dirtyPal=1;
+#ifndef NO_SYNC
+			else sync();
+#endif
+		}
+		else	ret = -1;
+		if (!ret)
+			strcpy(noticeMsg, load ? "GAME LOADED  " : "GAME SAVED   ");
+		else
+		{
 			strcpy(noticeMsg, load ? "LOAD FAILED  " : "SAVE FAILED  ");
 			ret = -1;
 		}