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

diff --git a/gp2x/emu.c b/gp2x/emu.c
index 871d05f..1c81c87 100644
--- a/gp2x/emu.c
+++ b/gp2x/emu.c
@@ -564,7 +564,7 @@ void emu_Deinit(void)
 }
 
 
-void osd_text(int x, int y, char *text)
+void osd_text(int x, int y, const char *text)
 {
 	int len = strlen(text)*8;
 
@@ -634,10 +634,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;
 
@@ -764,6 +764,12 @@ static int check_save_file(void)
 	return 0;
 }
 
+static void emu_state_cb(const char *str)
+{
+	clearArea(0);
+	blit("", str);
+}
+
 static void RunEvents(unsigned int which)
 {
 	if(which & 0x1800) { // save or load (but not both)
@@ -777,8 +783,11 @@ static void RunEvents(unsigned int which)
 			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;
@@ -1001,6 +1010,7 @@ void emu_Loop(void)
 
 	// make sure we are in correct mode
 	vidResetMode();
+	Pico.m.dirtyPal = 1;
 	oldmodes = ((Pico.video.reg[12]&1)<<2) ^ 0xc;
 	find_combos();
 
@@ -1223,10 +1233,24 @@ if (Pico.m.frame_count == 31563) {
 
 	// save SRAM
 	if((currentConfig.EmuOpt & 1) && SRam.changed) {
-		blit("", "Writing SRAM/BRAM..");
+		osd_text(4, 232, "Writing SRAM/BRAM..");
 		emu_SaveLoadGame(0, 1);
 		SRam.changed = 0;
 	}
+
+	// if in 16bit mode, generate 8it image for menu background
+	if (!(PicoOpt&0x10) && (currentConfig.EmuOpt&0x80)) {
+		PicoOpt |= 0x10;
+		if (!(Pico.video.reg[12]&1)) clearArea(1);
+		PicoFrameFull();
+		vidCpyM2((unsigned char *)gp2x_screen+320*8, framebuff+328*8);
+		vidConvCpyRGB32(localPal, Pico.cram, 0x40);
+		gp2x_video_setpalette(localPal, 0x40);
+		PicoOpt &= ~0x10;
+	}
+
+	// for menu bg
+	gp2x_memcpy_all_buffers(gp2x_screen, 0, 320*240*2);
 }