merging changes from Zopenko's 3.3.8

2024-10-31 22:45:05 +01:00 · 2016-12-10 12:37:33 -07:00 · 2016-12-10 12:37:33 -07:00 · a5eeb6fc02
commit a5eeb6fc02
parent bd852ee80d
14 changed files with 206 additions and 410 deletions
--- a/readme.txt
+++ b/readme.txt
@ -12,7 +12,7 @@ Wii/GameCube.

 -=[ Releases ]=-

-https://github.com/dborth/fceugc/releases
+https://github.com/dborth/fceugx/releases

 -=[ Features ]=-

@ -37,6 +37,17 @@ https://github.com/dborth/fceugc/releases
 |0O×øo·                         UPDATE HISTORY                        ·oø×O0|
 `¨•¨¨¨¨¨ ¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨ ¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨ ¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨ ¨¨¨¨¨¨¨¨¨¨¨¨¨'

+[3.3.8 - May 14, 2016]
+
+* Removed some unused and redundant palettes (thanks to Burnt Lasagna), new naming convention is:
+    + Accurate Colors = Unsaturated-V5 Palette By FirebrandX
+    + Vivid Colors = YUV-V3 Palette By FirebrandX
+    + Wii VC Colors	= Wii's Virtual Console Palette By SuperrSonic
+    + 3DS VC Colors	= 3DS's Virtual Console Palette By SuperrSonic
+	+ FCEUGX Colors	= Real Palette by AspiringSquire
+* Added a new "Delete" button in the Game Options, to erase Save States and SRAM files.
+* NES Zapper support fixed (thanks to Burnt Lasagna)
+
 [3.3.7 -  Apr 18, 2016]

 * Added both Firebrandx NES color palettes (thanks to SuperrSonic and Asho).
@ -553,6 +564,8 @@ Timing - NTSC or PAL (Depends if you're running a PAL or NTSC game)
 			Menu artwork				the3seashells
 			Menu sound					Peter de Man
 			Logo design					mvit
+			Additional updates/fixes	Zopenko, Burnt Lasagna, Askot
+			Beta testing, bug reports	Sindrik, niuus
 			
 			¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨
 			FCE Ultra GX GameCube		SoftDev,
--- a/source/fceugx.h
+++ b/source/fceugx.h
@ -17,7 +17,7 @@
 #include "fceultra/driver.h"

 #define APPNAME			"FCE Ultra GX"
-#define APPVERSION		"3.3.9"
+#define APPVERSION		"3.3.8"
 #define APPFOLDER 		"fceugx"
 #define PREF_FILE_NAME	"settings.xml"

@ -80,8 +80,8 @@ enum
 struct SGCSettings
 {
 	int		AutoLoad;
-	int		AutoSave;
-	int		LoadMethod; // For ROMS: Auto, SD, DVD, USB, Network (SMB)
+    int		AutoSave;
+    int		LoadMethod; // For ROMS: Auto, SD, DVD, USB, Network (SMB)
 	int		SaveMethod; // For SRAM, Freeze, Prefs: Auto, SD, USB, SMB
 	char	LoadFolder[MAXPATHLEN]; // Path to game files
 	char	LastFileLoaded[MAXPATHLEN]; //Last file loaded filename
--- a/source/fceultra/fds.cpp
+++ b/source/fceultra/fds.cpp
@ -154,14 +154,14 @@ void FCEU_FDSInsert(void) {
 		FCEUMOV_AddCommand(FCEUNPCMD_FDSINSERT);

 	if (TotalSides == 0) {
-		FCEU_DispMessage("Not FDS; can't eject disk.", 0);
+		FCEU_DispMessage("", 0);// remove text "Not FDS; can't eject disk."
 		return;
 	}
 	if (InDisk == 255) {
-		FCEU_DispMessage("Disk %d Side %s Inserted", 0, SelectDisk >> 1, (SelectDisk & 1) ? "B" : "A");
+		//FCEU_DispMessage("Disk %d Side %s Inserted", 0, SelectDisk >> 1, (SelectDisk & 1) ? "B" : "A");
 		InDisk = SelectDisk;
 	} else {
-		FCEU_DispMessage("Disk %d Side %s Ejected", 0, SelectDisk >> 1, (SelectDisk & 1) ? "B" : "A");
+		//FCEU_DispMessage("Disk %d Side %s Ejected", 0, SelectDisk >> 1, (SelectDisk & 1) ? "B" : "A");
 		InDisk = 255;
 	}
 }
@ -178,15 +178,15 @@ void FCEU_FDSSelect(void) {
 		FCEUMOV_AddCommand(FCEUNPCMD_FDSSELECT);

 	if (TotalSides == 0) {
-		FCEU_DispMessage("Not FDS; can't select disk.", 0);
+		FCEU_DispMessage("", 0);//remove text "Not FDS; can't select disk."
 		return;
 	}
 	if (InDisk != 255) {
-		FCEU_DispMessage("Eject disk before selecting.", 0);
+		FCEU_DispMessage("", 0); //remove text "Eject disk before selecting"
 		return;
 	}
 	SelectDisk = ((SelectDisk + 1) % TotalSides) & 3;
-	FCEU_DispMessage("Disk %d Side %c Selected", 0, SelectDisk >> 1, (SelectDisk & 1) ? 'B' : 'A');
+	FCEU_DispMessage("", 0); //("Disk %d Side %c Selected", 0, SelectDisk >> 1, (SelectDisk & 1) ? 'B' : 'A');
 }

 static void FDSFix(int a) {
--- a/source/fceultra/input/zapper.cpp
+++ b/source/fceultra/input/zapper.cpp
@ -77,17 +77,18 @@ static void ZapperFrapper(int w, uint8 *bg, uint8 *spr, uint32 linets, int final
 endo:
 	ZD[w].zappo=final;
 	
-    //if this was a miss, clear out the hit
+#ifndef GEKKO
+	//if this was a miss, clear out the hit
    if(ZD[w].mzb&2)
        ZD[w].zaphit=0;
-        
+#endif
 }      

 static INLINE int CheckColor(int w)
 {
 	FCEUPPU_LineUpdate();
 	
-    if(newppu)
+	if(newppu)
    {
        int x = (int)ZD[w].mzx;
        int y = (int)ZD[w].mzy;
@ -116,10 +117,15 @@ static INLINE int CheckColor(int w)
    }


+#ifdef GEKKO
+	if((ZD[w].zaphit+100)>=(timestampbase+timestamp)
+		&& !(ZD[w].mzb&2)) return 0;
+#else
    if((ZD[w].zaphit+100)>=(timestampbase+timestamp))
    {
        return 0;
    }
+#endif

 	return 1;
 }
@ -168,7 +174,16 @@ static void DrawZapper(int w, uint8 *buf, int arg)
 static void UpdateZapper(int w, void *data, int arg)
 {
 	uint32 *ptr=(uint32 *)data;
+#ifdef GEKKO
+	if(ZD[w].bogo)
+		ZD[w].bogo--;	
+	if(ptr[2]&3 && (!(ZD[w].mzb&3)))
+		ZD[w].bogo=5;

+	ZD[w].mzx=ptr[0];
+	ZD[w].mzy=ptr[1];
+	ZD[w].mzb=ptr[2];
+#else
    bool newclicked = (ptr[2]&3)!=0;
    bool oldclicked = (ZD[w].lastInput)!=0;

@ -187,7 +202,7 @@ static void UpdateZapper(int w, void *data, int arg)
 	    ZD[w].mzx=ptr[0];
 	    ZD[w].mzy=ptr[1];
    }
-
+#endif
 }

 static void LogZapper(int w, MovieRecord* mr)
--- a/source/gcvideo.cpp
+++ b/source/gcvideo.cpp
@ -1297,7 +1297,83 @@ void SetPalette()
 }

 struct st_palettes palettes[] = {
-	{ "asqrealc", "AspiringSquire's Real palette",
+	// Unsaturated-V5 Palette By FirebrandX
+    { "accurate", "Accurate Colors",
+          { 0x6b6b6b, 0x001e87, 0x1f0b96, 0x3b0c87,
+			0x590d61, 0x5e0528, 0x551100, 0x461b00,
+			0x303200, 0x0a4800, 0x004e00, 0x004619,
+			0x00395a, 0x000000, 0x000000, 0x000000,
+			0xb2b2b2, 0x1a53d1, 0x4835ee, 0x7123ec,
+			0x9a1eb7, 0xa51e62, 0xa52d19, 0x874b00,
+			0x676900, 0x298400, 0x038b00, 0x008240,
+			0x007096, 0x000000, 0x000000, 0x000000,
+			0xffffff, 0x63adfd, 0x908afe, 0xb977fc,
+			0xe771fe, 0xf76fc9, 0xf5836a, 0xdd9c29,
+			0xbdb807, 0x84d107, 0x5bdc3b, 0x48d77d,
+			0x48c6d8, 0x555555, 0x000000, 0x000000,
+			0xffffff, 0xc4e3fe, 0xd7d5fe, 0xe6cdfe,
+			0xf9cafe, 0xfec9f0, 0xfed1c7, 0xf7dcac,
+			0xe8e89c, 0xd1f29d, 0xbff4b1, 0xb7f5cd,
+			0xb7ebf2, 0xbebebe, 0x000000, 0x000000 }
+    },
+    // YUV-V3 Palette By FirebrandX
+	{ "vivid", "Vivid Colors",
+          { 0x666666, 0x002a88, 0x1412a7, 0x3b00a4,
+			0x5c007e, 0x6e0040, 0x6c0700, 0x561d00,
+			0x333500, 0x0c4800, 0x005200, 0x004c18,
+			0x003e5b, 0x000000, 0x000000, 0x000000,
+			0xadadad, 0x155fd9, 0x4240ff, 0x7527fe,
+			0xa01acc, 0xb71e7b, 0xb53120, 0x994e00,
+			0x6b6d00, 0x388700, 0x0d9300, 0x008c47,
+			0x007aa0, 0x000000, 0x000000, 0x000000,
+			0xffffff, 0x64b0ff, 0x9290ff, 0xc676ff,
+			0xf26aff, 0xff6ecc, 0xff8170, 0xea9e22,
+			0xbcbe00, 0x88d800, 0x5ce430, 0x45e082,
+			0x48cdde, 0x4f4f4f, 0x000000, 0x000000,
+			0xffffff, 0xc0dfff, 0xd3d2ff, 0xe8c8ff,
+			0xfac2ff, 0xffc4ea, 0xffccc5, 0xf7d8a5,
+			0xe4e594, 0xcfef96, 0xbdf4ab, 0xb3f3cc,
+			0xb5ebf2, 0xb8b8b8, 0x000000, 0x000000 }
+	},
+	// Wii Virtual Console palette by SuperrSonic's
+    { "wiivc", "Wii VC Colors",
+		  { 0x494949, 0x00006a, 0x090063, 0x290059,
+			0x42004a, 0x490000, 0x420000, 0x291100,
+			0x182700, 0x003010, 0x003000, 0x002910,
+			0x012043, 0x000000, 0x000000, 0x000000,
+			0x747174, 0x003084, 0x3101ac, 0x4b0194,
+			0x64007b, 0x6b0039, 0x6b2101, 0x5a2f00,
+			0x424900, 0x185901, 0x105901, 0x015932,
+			0x01495a, 0x101010, 0x000000, 0x000000,
+			0xadadad, 0x4a71b6, 0x6458d5, 0x8450e6,
+			0xa451ad, 0xad4984, 0xb5624a, 0x947132,
+			0x7b722a, 0x5a8601, 0x388e31, 0x318e5a,
+			0x398e8d, 0x383838, 0x000000, 0x000000,
+			0xb6b6b6, 0x8c9db5, 0x8d8eae, 0x9c8ebc,
+			0xa687bc, 0xad8d9d, 0xae968c, 0x9c8f7c,
+			0x9c9e72, 0x94a67c, 0x84a77b, 0x7c9d84,
+			0x73968d, 0xdedede, 0x000000, 0x000000 }
+    },
+	// 3DS Virtual Console palette by SuperrSonic's
+    { "3dsvc", "3DS VC Colors",
+	      { 0x494949, 0x00006a, 0x090063, 0x290059,
+			0x42004a, 0x490000, 0x420000, 0x291100,
+			0x182700, 0x003010, 0x003000, 0x002910,
+			0x012043, 0x000000, 0x000000, 0x000000,
+			0x747174, 0x003084, 0x3101ac, 0x4b0194,
+			0x64007b, 0x6b0039, 0x6b2101, 0x5a2f00,
+			0x424900, 0x185901, 0x105901, 0x015932,
+			0x01495a, 0x101010, 0x000000, 0x000000,
+			0xadadad, 0x4a71b6, 0x6458d5, 0x8450e6,
+			0xa451ad, 0xad4984, 0xb5624a, 0x947132,
+			0x7b722a, 0x5a8601, 0x388e31, 0x318e5a,
+			0x398e8d, 0x383838, 0x000000, 0x000000,
+			0xb6b6b6, 0x8c9db5, 0x8d8eae, 0x9c8ebc,
+			0xa687bc, 0xad8d9d, 0xae968c, 0x9c8f7c,
+			0x9c9e72, 0x94a67c, 0x84a77b, 0x7c9d84,
+			0x73968d, 0xdedede, 0x000000, 0x000000 }
+    },
+	{ "asqrealc", "FCEUGX Colors",
 		{ 0x6c6c6c, 0x00268e, 0x0000a8, 0x400094,
 			0x700070, 0x780040, 0x700000, 0x621600,
 			0x442400, 0x343400, 0x005000, 0x004444,
@ -1314,313 +1390,7 @@ struct st_palettes palettes[] = {
 			0xffb0ff, 0xffb8e8, 0xffc4c4, 0xffd4a8,
 			0xffe890, 0xf0f4a4, 0xc0ffc0, 0xacf4f0,
 			0xa0e8ff, 0xc2c2c2, 0x202020, 0x101010 }
-	},
-	{ "loopy", "Loopy's palette",
-		{ 0x757575, 0x271b8f, 0x0000ab, 0x47009f,
-			0x8f0077, 0xab0013, 0xa70000, 0x7f0b00,
-			0x432f00, 0x004700, 0x005100, 0x003f17,
-			0x1b3f5f, 0x000000, 0x000000, 0x000000,
-			0xbcbcbc, 0x0073ef, 0x233bef, 0x8300f3,
-			0xbf00bf, 0xe7005b, 0xdb2b00, 0xcb4f0f,
-			0x8b7300, 0x009700, 0x00ab00, 0x00933b,
-			0x00838b, 0x000000, 0x000000, 0x000000,
-			0xffffff, 0x3fbfff, 0x5f97ff, 0xa78bfd,
-			0xf77bff, 0xff77b7, 0xff7763, 0xff9b3b,
-			0xf3bf3f, 0x83d313, 0x4fdf4b, 0x58f898,
-			0x00ebdb, 0x000000, 0x000000, 0x000000,
-			0xffffff, 0xabe7ff, 0xc7d7ff, 0xd7cbff,
-			0xffc7ff, 0xffc7db, 0xffbfb3, 0xffdbab,
-			0xffe7a3, 0xe3ffa3, 0xabf3bf, 0xb3ffcf,
-			0x9ffff3, 0x000000, 0x000000, 0x000000 }
-		},
-	{ "quor", "Quor's palette",
-		{ 0x3f3f3f, 0x001f3f, 0x00003f, 0x1f003f,
-			0x3f003f, 0x3f0020, 0x3f0000, 0x3f2000,
-			0x3f3f00, 0x203f00, 0x003f00, 0x003f20,
-			0x003f3f, 0x000000, 0x000000, 0x000000,
-			0x7f7f7f, 0x405f7f, 0x40407f, 0x5f407f,
-			0x7f407f, 0x7f4060, 0x7f4040, 0x7f6040,
-			0x7f7f40, 0x607f40, 0x407f40, 0x407f60,
-			0x407f7f, 0x000000, 0x000000, 0x000000,
-			0xbfbfbf, 0x809fbf, 0x8080bf, 0x9f80bf,
-			0xbf80bf, 0xbf80a0, 0xbf8080, 0xbfa080,
-			0xbfbf80, 0xa0bf80, 0x80bf80, 0x80bfa0,
-			0x80bfbf, 0x000000, 0x000000, 0x000000,
-			0xffffff, 0xc0dfff, 0xc0c0ff, 0xdfc0ff,
-			0xffc0ff, 0xffc0e0, 0xffc0c0, 0xffe0c0,
-			0xffffc0, 0xe0ffc0, 0xc0ffc0, 0xc0ffe0,
-			0xc0ffff, 0x000000, 0x000000, 0x000000 }
-		},
-	{ "wiivc", "SuperrSonic's WIIvc palette",
-		{ 0x494949, 0x00006a, 0x090063, 0x290059,
-			0x42004a, 0x490000, 0x420000, 0x291100,
-			0x182700, 0x003010, 0x003000, 0x002910,
-			0x012043, 0x000000, 0x000000, 0x000000,
-			0x747174, 0x003084, 0x3101ac, 0x4b0194,
-			0x64007b, 0x6b0039, 0x6b2101, 0x5a2f00,
-			0x424900, 0x185901, 0x105901, 0x015932,
-			0x01495a, 0x101010, 0x000000, 0x000000,
-			0xadadad, 0x4a71b6, 0x6458d5, 0x8450e6,
-			0xa451ad, 0xad4984, 0xb5624a, 0x947132,
-			0x7b722a, 0x5a8601, 0x388e31, 0x318e5a,
-			0x398e8d, 0x383838, 0x000000, 0x000000,
-			0xb6b6b6, 0x8c9db5, 0x8d8eae, 0x9c8ebc,
-			0xa687bc, 0xad8d9d, 0xae968c, 0x9c8f7c,
-			0x9c9e72, 0x94a67c, 0x84a77b, 0x7c9d84,
-			0x73968d, 0xdedede, 0x000000, 0x000000 }
-	},
-	{ "3dsvc", "SuperrSonic's 3DSvc palette",
-		{ 0x494949, 0x00006a, 0x090063, 0x290059,
-			0x42004a, 0x490000, 0x420000, 0x291100,
-			0x182700, 0x003010, 0x003000, 0x002910,
-			0x012043, 0x000000, 0x000000, 0x000000,
-			0x747174, 0x003084, 0x3101ac, 0x4b0194,
-			0x64007b, 0x6b0039, 0x6b2101, 0x5a2f00,
-			0x424900, 0x185901, 0x105901, 0x015932,
-			0x01495a, 0x101010, 0x000000, 0x000000,
-			0xadadad, 0x4a71b6, 0x6458d5, 0x8450e6,
-			0xa451ad, 0xad4984, 0xb5624a, 0x947132,
-			0x7b722a, 0x5a8601, 0x388e31, 0x318e5a,
-			0x398e8d, 0x383838, 0x000000, 0x000000,
-			0xb6b6b6, 0x8c9db5, 0x8d8eae, 0x9c8ebc,
-			0xa687bc, 0xad8d9d, 0xae968c, 0x9c8f7c,
-			0x9c9e72, 0x94a67c, 0x84a77b, 0x7c9d84,
-			0x73968d, 0xdedede, 0x000000, 0x000000 }
-	},
-	{ "chris", "Chris Covell's palette",
-		{ 0x808080, 0x003DA6, 0x0012B0, 0x440096,
-			0xA1005E, 0xC70028, 0xBA0600, 0x8C1700,
-			0x5C2F00, 0x104500, 0x054A00, 0x00472E,
-			0x004166, 0x000000, 0x050505, 0x050505,
-			0xC7C7C7, 0x0077FF, 0x2155FF, 0x8237FA,
-			0xEB2FB5, 0xFF2950, 0xFF2200, 0xD63200,
-			0xC46200, 0x358000, 0x058F00, 0x008A55,
-			0x0099CC, 0x212121, 0x090909, 0x090909,
-			0xFFFFFF, 0x0FD7FF, 0x69A2FF, 0xD480FF,
-			0xFF45F3, 0xFF618B, 0xFF8833, 0xFF9C12,
-			0xFABC20, 0x9FE30E, 0x2BF035, 0x0CF0A4,
-			0x05FBFF, 0x5E5E5E, 0x0D0D0D, 0x0D0D0D,
-			0xFFFFFF, 0xA6FCFF, 0xB3ECFF, 0xDAABEB,
-			0xFFA8F9, 0xFFABB3, 0xFFD2B0, 0xFFEFA6,
-			0xFFF79C, 0xD7E895, 0xA6EDAF, 0xA2F2DA,
-			0x99FFFC, 0xDDDDDD, 0x111111, 0x111111 }
-		},
-	{ "matt", "Matthew Conte's palette",
-		{ 0x808080, 0x0000bb, 0x3700bf, 0x8400a6,
-			0xbb006a, 0xb7001e, 0xb30000, 0x912600,
-			0x7b2b00, 0x003e00, 0x00480d, 0x003c22,
-			0x002f66, 0x000000, 0x050505, 0x050505,
-			0xc8c8c8, 0x0059ff, 0x443cff, 0xb733cc,
-			0xff33aa, 0xff375e, 0xff371a, 0xd54b00,
-			0xc46200, 0x3c7b00, 0x1e8415, 0x009566,
-			0x0084c4, 0x111111, 0x090909, 0x090909,
-			0xffffff, 0x0095ff, 0x6f84ff, 0xd56fff,
-			0xff77cc, 0xff6f99, 0xff7b59, 0xff915f,
-			0xffa233, 0xa6bf00, 0x51d96a, 0x4dd5ae,
-			0x00d9ff, 0x666666, 0x0d0d0d, 0x0d0d0d,
-			0xffffff, 0x84bfff, 0xbbbbff, 0xd0bbff,
-			0xffbfea, 0xffbfcc, 0xffc4b7, 0xffccae,
-			0xffd9a2, 0xcce199, 0xaeeeb7, 0xaaf7ee,
-			0xb3eeff, 0xdddddd, 0x111111, 0x111111 }
-		},
-	{ "pasofami", "PasoFami/99 palette",
-		{ 0x7f7f7f, 0x0000ff, 0x0000bf, 0x472bbf,
-			0x970087, 0xab0023, 0xab1300, 0x8b1700,
-			0x533000, 0x007800, 0x006b00, 0x005b00,
-			0x004358, 0x000000, 0x000000, 0x000000,
-			0xbfbfbf, 0x0078f8, 0x0058f8, 0x6b47ff,
-			0xdb00cd, 0xe7005b, 0xf83800, 0xe75f13,
-			0xaf7f00, 0x00b800, 0x00ab00, 0x00ab47,
-			0x008b8b, 0x000000, 0x000000, 0x000000,
-			0xf8f8f8, 0x3fbfff, 0x6b88ff, 0x9878f8,
-			0xf878f8, 0xf85898, 0xf87858, 0xffa347,
-			0xf8b800, 0xb8f818, 0x5bdb57, 0x58f898,
-			0x00ebdb, 0x787878, 0x000000, 0x000000,
-			0xffffff, 0xa7e7ff, 0xb8b8f8, 0xd8b8f8,
-			0xf8b8f8, 0xfba7c3, 0xf0d0b0, 0xffe3ab,
-			0xfbdb7b, 0xd8f878, 0xb8f8b8, 0xb8f8d8,
-			0x00ffff, 0xf8d8f8, 0x000000, 0x000000 }
-		},
-	{ "crashman", "CrashMan's palette",
-			{ 0x585858, 0x001173, 0x000062, 0x472bbf,
-				0x970087, 0x910009, 0x6f1100, 0x4c1008,
-				0x371e00, 0x002f00, 0x005500, 0x004d15,
-				0x002840, 0x000000, 0x000000, 0x000000,
-				0xa0a0a0, 0x004499, 0x2c2cc8, 0x590daa,
-				0xae006a, 0xb00040, 0xb83418, 0x983010,
-				0x704000, 0x308000, 0x207808, 0x007b33,
-				0x1c6888, 0x000000, 0x000000, 0x000000,
-				0xf8f8f8, 0x267be1, 0x5870f0, 0x9878f8,
-				0xff73c8, 0xf060a8, 0xd07b37, 0xe09040,
-				0xf8b300, 0x8cbc00, 0x40a858, 0x58f898,
-				0x00b7bf, 0x787878, 0x000000, 0x000000,
-				0xffffff, 0xa7e7ff, 0xb8b8f8, 0xd8b8f8,
-				0xe6a6ff, 0xf29dc4, 0xf0c0b0, 0xfce4b0,
-				0xe0e01e, 0xd8f878, 0xc0e890, 0x95f7c8,
-				0x98e0e8, 0xf8d8f8, 0x000000, 0x000000 }
-		},
-	{ "mess", "MESS palette",
-		{ 0x747474, 0x24188c, 0x0000a8, 0x44009c,
-			0x8c0074, 0xa80010, 0xa40000, 0x7c0800,
-			0x402c00, 0x004400, 0x005000, 0x003c14,
-			0x183c5c, 0x000000, 0x000000, 0x000000,
-			0xbcbcbc, 0x0070ec, 0x2038ec, 0x8000f0,
-			0xbc00bc, 0xe40058, 0xd82800, 0xc84c0c,
-			0x887000, 0x009400, 0x00a800, 0x009038,
-			0x008088, 0x000000, 0x000000, 0x000000,
-			0xfcfcfc, 0x3cbcfc, 0x5c94fc, 0x4088fc,
-			0xf478fc, 0xfc74b4, 0xfc7460, 0xfc9838,
-			0xf0bc3c, 0x80d010, 0x4cdc48, 0x58f898,
-			0x00e8d8, 0x000000, 0x000000, 0x000000,
-			0xfcfcfc, 0xa8e4fc, 0xc4d4fc, 0xd4c8fc,
-			0xfcc4fc, 0xfcc4d8, 0xfcbcb0, 0xfcd8a8,
-			0xfce4a0, 0xe0fca0, 0xa8f0bc, 0xb0fccc,
-			0x9cfcf0, 0x000000, 0x000000, 0x000000 }
-		},
-	{ "zaphod-cv", "Zaphod's VS Castlevania palette",
-		{ 0x7f7f7f, 0xffa347, 0x0000bf, 0x472bbf,
-			0x970087, 0xf85898, 0xab1300, 0xf8b8f8,
-			0xbf0000, 0x007800, 0x006b00, 0x005b00,
-			0xffffff, 0x9878f8, 0x000000, 0x000000,
-			0xbfbfbf, 0x0078f8, 0xab1300, 0x6b47ff,
-			0x00ae00, 0xe7005b, 0xf83800, 0x7777ff,
-			0xaf7f00, 0x00b800, 0x00ab00, 0x00ab47,
-			0x008b8b, 0x000000, 0x000000, 0x472bbf,
-			0xf8f8f8, 0xffe3ab, 0xf87858, 0x9878f8,
-			0x0078f8, 0xf85898, 0xbfbfbf, 0xffa347,
-			0xc800c8, 0xb8f818, 0x7f7f7f, 0x007800,
-			0x00ebdb, 0x000000, 0x000000, 0xffffff,
-			0xffffff, 0xa7e7ff, 0x5bdb57, 0xe75f13,
-			0x004358, 0x0000ff, 0xe7005b, 0x00b800,
-			0xfbdb7b, 0xd8f878, 0x8b1700, 0xffe3ab,
-			0x00ffff, 0xab0023, 0x000000, 0x000000 }
-		},
-	{ "zaphod-smb", "Zaphod's VS SMB palette",
-		{ 0x626a00, 0x0000ff, 0x006a77, 0x472bbf,
-			0x970087, 0xab0023, 0xab1300, 0xb74800,
-			0xa2a2a2, 0x007800, 0x006b00, 0x005b00,
-			0xffd599, 0xffff00, 0x009900, 0x000000,
-			0xff66ff, 0x0078f8, 0x0058f8, 0x6b47ff,
-			0x000000, 0xe7005b, 0xf83800, 0xe75f13,
-			0xaf7f00, 0x00b800, 0x5173ff, 0x00ab47,
-			0x008b8b, 0x000000, 0x91ff88, 0x000088,
-			0xf8f8f8, 0x3fbfff, 0x6b0000, 0x4855f8,
-			0xf878f8, 0xf85898, 0x595958, 0xff009d,
-			0x002f2f, 0xb8f818, 0x5bdb57, 0x58f898,
-			0x00ebdb, 0x787878, 0x000000, 0x000000,
-			0xffffff, 0xa7e7ff, 0x590400, 0xbb0000,
-			0xf8b8f8, 0xfba7c3, 0xffffff, 0x00e3e1,
-			0xfbdb7b, 0xffae00, 0xb8f8b8, 0xb8f8d8,
-			0x00ff00, 0xf8d8f8, 0xffaaaa, 0x004000 }
-		},
-	{ "vs-drmar", "VS Dr. Mario palette",
-		{ 0x5f97ff, 0x000000, 0x000000, 0x47009f,
-			0x00ab00, 0xffffff, 0xabe7ff, 0x000000,
-			0x000000, 0x000000, 0x000000, 0x000000,
-			0xe7005b, 0x000000, 0x000000, 0x000000,
-			0x5f97ff, 0x000000, 0x000000, 0x000000,
-			0x000000, 0x8b7300, 0xcb4f0f, 0x000000,
-			0xbcbcbc, 0x000000, 0x000000, 0x000000,
-			0x000000, 0x000000, 0x000000, 0x000000,
-			0x00ebdb, 0x000000, 0x000000, 0x000000,
-			0x000000, 0xff9b3b, 0x000000, 0x000000,
-			0x83d313, 0x000000, 0x3fbfff, 0x000000,
-			0x0073ef, 0x000000, 0x000000, 0x000000,
-			0x00ebdb, 0x000000, 0x000000, 0x000000,
-			0x000000, 0x000000, 0xf3bf3f, 0x000000,
-			0x005100, 0x000000, 0xc7d7ff, 0xffdbab,
-			0x000000, 0x000000, 0x000000, 0x000000 }
-		},
-	{ "vs-cv", "VS Castlevania palette",
-		{ 0xaf7f00, 0xffa347, 0x008b8b, 0x472bbf,
-			0x970087, 0xf85898, 0xab1300, 0xf8b8f8,
-			0xf83800, 0x007800, 0x006b00, 0x005b00,
-			0xffffff, 0x9878f8, 0x00ab00, 0x000000,
-			0xbfbfbf, 0x0078f8, 0xab1300, 0x6b47ff,
-			0x000000, 0xe7005b, 0xf83800, 0x6b88ff,
-			0xaf7f00, 0x00b800, 0x6b88ff, 0x00ab47,
-			0x008b8b, 0x000000, 0x000000, 0x472bbf,
-			0xf8f8f8, 0xffe3ab, 0xf87858, 0x9878f8,
-			0x0078f8, 0xf85898, 0xbfbfbf, 0xffa347,
-			0x004358, 0xb8f818, 0x7f7f7f, 0x007800,
-			0x00ebdb, 0x000000, 0x000000, 0xffffff,
-			0xffffff, 0xa7e7ff, 0x5bdb57, 0x6b88ff,
-			0x004358, 0x0000ff, 0xe7005b, 0x00b800,
-			0xfbdb7b, 0xffa347, 0x8b1700, 0xffe3ab,
-			0xb8f818, 0xab0023, 0x000000, 0x007800 }
-		},
-	{ "vs-smb", "VS SMB/VS Ice Climber palette",
-		{ 0xaf7f00, 0x0000ff, 0x008b8b, 0x472bbf,
-			0x970087, 0xab0023, 0x0000ff, 0xe75f13,
-			0xbfbfbf, 0x007800, 0x5bdb57, 0x005b00,
-			0xf0d0b0, 0xffe3ab, 0x00ab00, 0x000000,
-			0xbfbfbf, 0x0078f8, 0x0058f8, 0x6b47ff,
-			0x000000, 0xe7005b, 0xf83800, 0xf87858,
-			0xaf7f00, 0x00b800, 0x6b88ff, 0x00ab47,
-			0x008b8b, 0x000000, 0x000000, 0x3fbfff,
-			0xf8f8f8, 0x006b00, 0x8b1700, 0x9878f8,
-			0x6b47ff, 0xf85898, 0x7f7f7f, 0xe7005b,
-			0x004358, 0xb8f818, 0x0078f8, 0x58f898,
-			0x00ebdb, 0xfbdb7b, 0x000000, 0x000000,
-			0xffffff, 0xa7e7ff, 0xb8b8f8, 0xf83800,
-			0xf8b8f8, 0xfba7c3, 0xffffff, 0x00ffff,
-			0xfbdb7b, 0xffa347, 0xb8f8b8, 0xb8f8d8,
-			0xb8f818, 0xf8d8f8, 0x000000, 0x007800 }
-		},
-	{ "RGB", "Nestopia's RGB palette",
-		{ 0x6d6d6d, 0x002492, 0x0000db, 0x6d49db,
-			0x92006d, 0xb6006d, 0xb62400, 0x924900,
-			0x6d4900, 0x244900, 0x006d24, 0x009200,
-			0x004949, 0x000000, 0x000000, 0x000000,
-			0xb6b6b6, 0x006ddb, 0x0049ff, 0x9200ff,
-			0xb600ff, 0xff0092, 0xff0000, 0xdb6d00,
-			0x926d00, 0x249200, 0x009200, 0x00b66d,
-			0x009292, 0x242424, 0x000000, 0x000000,
-			0xffffff, 0x6db6ff, 0x9292ff, 0xdb6dff,
-			0xff00ff, 0xff6dff, 0xff9200, 0xffb600,
-			0xdbdb00, 0x6ddb00, 0x00ff00, 0x49ffdb,
-			0x00ffff, 0x494949, 0x000000, 0x000000,
-			0xffffff, 0xb6dbff, 0xdbb6ff, 0xffb6ff,
-			0xff92ff, 0xffb6b6, 0xffdb92, 0xffff49,
-			0xffff6d, 0xb6ff49, 0x92ff6d, 0x49ffdb,
-			0x92dbff, 0x929292, 0x000000, 0x000000 }
-		},
-	{ "Uns-v6", "Unsaturated-V6 palette",
-		{ 0x6B6B6B, 0x001E87, 0x1F0B96, 0x3B0C87,
-			0x590D61, 0x5E0528, 0x551100, 0x461B00,
-			0x303200, 0x0A4800, 0x004E00, 0x004619,
-			0x003A58, 0x000000, 0x000000, 0x000000,
-			0xB2B2B2, 0x1A53D1, 0x4835EE, 0x7123EC,
-			0x9A1EB7, 0xA51E62, 0xA52D19, 0x874B00,
-			0x676900, 0x298400, 0x038B00, 0x008240,
-			0x007891, 0x000000, 0x000000, 0x000000,
-			0xFFFFFF, 0x63ADFD, 0x908AFE, 0xB977FC,
-			0xE771FE, 0xF76FC9, 0xF5836A, 0xDD9C29,
-			0xBDB807, 0x84D107, 0x5BDC3B, 0x48D77D,
-			0x48CCCE, 0x555555, 0x000000, 0x000000,
-			0xFFFFFF, 0xC4E3FE, 0xD7D5FE, 0xE6CDFE,
-			0xF9CAFE, 0xFEC9F0, 0xFED1C7, 0xF7DCAC,
-			0xE8E89C, 0xD1F29D, 0xBFF4B1, 0xB7F5CD,
-			0xB7F0EE, 0xBEBEBE, 0x000000, 0x000000 }
-		},
-	{ "YUV-V3", "YUV-V3 palette",
-		{ 0x666666, 0x002a88, 0x1412a7, 0x3b00a4,
-			0x5c007e, 0x6e0040, 0x6c0700, 0x561d00,
-			0x333500, 0x0c4800, 0x005200, 0x004c18,
-			0x003e5b, 0x000000, 0x000000, 0x000000,
-			0xadadad, 0x155fd9, 0x4240ff, 0x7527fe,
-			0xa01acc, 0xb71e7b, 0xb53120, 0x994e00,
-			0x6b6d00, 0x388700, 0x0d9300, 0x008c47,
-			0x007aa0, 0x000000, 0x000000, 0x000000,
-			0xffffff, 0x64b0ff, 0x9290ff, 0xc676ff,
-			0xf26aff, 0xff6ecc, 0xff8170, 0xea9e22,
-			0xbcbe00, 0x88d800, 0x5ce430, 0x45e082,
-			0x48cdde, 0x4f4f4f, 0x000000, 0x000000,
-			0xffffff, 0xc0dfff, 0xd3d2ff, 0xe8c8ff,
-			0xfac2ff, 0xffc4ea, 0xffccc5, 0xf7d8a5,
-			0xe4e594, 0xcfef96, 0xbdf4ab, 0xb3f3cc,
-			0xb5ebf2, 0xb8b8b8, 0x000000, 0x000000 }
-		}
+	}
 };

 //CAK: We need to know the OUT1 pin of the expansion port for Famicom 3D System glasses
--- a/source/gcvideo.h
+++ b/source/gcvideo.h
@ -13,7 +13,7 @@
 #define _GCVIDEO_H_

 // color palettes
-#define MAXPAL 18
+#define MAXPAL 5

 struct st_palettes {
    char name[32], desc[32];
--- a/source/gui/gui_savebrowser.cpp
+++ b/source/gui/gui_savebrowser.cpp
@ -24,6 +24,8 @@ GuiSaveBrowser::GuiSaveBrowser(int w, int h, SaveList * s, int a)

 	if(action == 0) // load
 		listOffset = 0;
+	else if(action == 2) // delete RAM/State
+		listOffset = 0;
 	else
 		listOffset = -2; // save - reserve -2 & -1 for new slots

@ -257,7 +259,8 @@ void GuiSaveBrowser::Update(GuiTrigger * t)
 		if(selectedItem == 0)
 		{
 			if((listOffset - 2 >= 0 && action == 0) || 
-				(listOffset >= 0 && action == 1))
+				(listOffset >= 0 && action == 1) ||
+				(listOffset - 2 >= 0 && action == 2))
 			{
 				// move list up by 1
 				listOffset -= 2;
@ -295,7 +298,8 @@ void GuiSaveBrowser::Update(GuiTrigger * t)
 		if(selectedItem < 2)
 		{
 			if((listOffset - 2 >= 0 && action == 0) ||
-				(listOffset >= 0 && action == 1))
+				(listOffset >= 0 && action == 1) ||
+				(listOffset - 2 >= 0 && action == 2))
 			{
 				// move list up by 1
 				listOffset -= 2;
--- a/source/images/button_gamesave.png
+++ b/source/images/button_gamesave.png
--- a/source/images/button_gamesave_over.png
+++ b/source/images/button_gamesave_over.png
--- a/source/images/unused/icon_game_controllers.png
+++ b/source/images/unused/icon_game_controllers.png
--- a/source/images/unused/icon_settings_powerpad.png
+++ b/source/images/unused/icon_settings_powerpad.png
--- a/source/menu.cpp
+++ b/source/menu.cpp
@ -790,13 +790,13 @@ static void WindowCredits(void * ptr)
 	creditsBoxImg.SetAlignment(ALIGN_CENTRE, ALIGN_MIDDLE);
 	creditsWindowBox.Append(&creditsBoxImg);

-	int numEntries = 25;
+	int numEntries = 27;
 	GuiText * txt[numEntries];

 	txt[i] = new GuiText("Credits", 30, (GXColor){0, 0, 0, 255});
 	txt[i]->SetAlignment(ALIGN_CENTRE, ALIGN_TOP); txt[i]->SetPosition(0,y); i++; y+=32;

-	txt[i] = new GuiText("Official Site: https://github.com/dborth/fceugc", 20, (GXColor){0, 0, 0, 255});
+	txt[i] = new GuiText("Official Site: https://github.com/dborth/fceugx", 20, (GXColor){0, 0, 0, 255});
 	txt[i]->SetAlignment(ALIGN_CENTRE, ALIGN_TOP); txt[i]->SetPosition(0,y); i++; y+=40;

 	txt[i]->SetPresets(20, (GXColor){0, 0, 0, 255}, 0,
@ -817,6 +817,10 @@ static void WindowCredits(void * ptr)
 	txt[i] = new GuiText("Logo");
 	txt[i]->SetPosition(40,y); i++;
 	txt[i] = new GuiText("mvit");
+	txt[i]->SetPosition(335,y); i++; y+=24;
+	txt[i] = new GuiText("Additional improvements");
+	txt[i]->SetPosition(40,y); i++;
+	txt[i] = new GuiText("Zopenko, Askot, others");
 	txt[i]->SetPosition(335,y); i++; y+=48;

 	txt[i] = new GuiText("FCE Ultra GX GameCube");
@ -1432,9 +1436,9 @@ static int MenuGame()
 	w.Append(&resetBtn);
 	w.Append(&gameSettingsBtn);

-	if(GCSettings.DisplayVM == 1)
+	if(GCSettings.DisplayVM == 1) //show memory usage
 	{
-		w.Append(&memTxt); //show memory usage	
+		w.Append(&memTxt);
 	}
 		
 	#ifdef HW_RVL
@ -3212,8 +3216,7 @@ static int MenuSettingsVideo()
 				break;

 			case 3: // palette
-				GCSettings.currpal++;
-				if ( GCSettings.currpal > MAXPAL )
+				if ( ++GCSettings.currpal > MAXPAL )
 					GCSettings.currpal = 0;
 				break;

@ -3274,7 +3277,8 @@ static int MenuSettingsVideo()
 				case 3: sprintf (options.value[2], "Both"); break;
 			}

-			sprintf (options.value[3], "%s", (GCSettings.currpal > -1) ? palettes[GCSettings.currpal].desc : "Default");
+			sprintf (options.value[3], "%s",
+				GCSettings.currpal ? palettes[GCSettings.currpal-1].desc : "Default Colors");
 
 			switch(GCSettings.timing)
 			{
@ -3290,11 +3294,16 @@ static int MenuSettingsVideo()

 			switch(GCSettings.videomode)
 			{
-				case 0: sprintf (options.value[9], "Automatic (Recommended)"); break;
-				case 1: sprintf (options.value[9], "NTSC (480i)"); break;
-				case 2: sprintf (options.value[9], "Progressive (480p)"); break;
-				case 3: sprintf (options.value[9], "PAL (50Hz)"); break;
-				case 4: sprintf (options.value[9], "PAL (60Hz)"); break;
+				case 0:
+					sprintf (options.value[9], "Automatic (Recommended)"); break;
+				case 1:
+					sprintf (options.value[9], "NTSC (480i)"); break;
+				case 2:
+					sprintf (options.value[9], "Progressive (480p)"); break;
+				case 3:
+					sprintf (options.value[9], "PAL (50Hz)"); break;
+				case 4:
+					sprintf (options.value[9], "PAL (60Hz)"); break;
 			}
 			optionBrowser.TriggerUpdate();
 		}
--- a/source/pad.cpp
+++ b/source/pad.cpp
@ -464,59 +464,6 @@ static unsigned char DecodeJoy(unsigned short chan)
 	}
 #endif

-	bool zapper_triggered = false;
-	// zapper enabled
-	if(GCSettings.Controller == CTRL_ZAPPER)
-	{
-		int z; // NES port # (0 or 1)
-
-		if(GameInfo->type == GIT_VSUNI)
-			z = 0;
-		else
-			z = 1;
-
-		myzappers[z][2] = 0; // reset trigger to not pressed
-
-		// is trigger pressed?
-		if ( (jp & btnmap[CTRL_ZAPPER][CTRLR_GCPAD][0])	// gamecube controller
-		#ifdef HW_RVL
-		|| ( (exp_type == WPAD_EXP_NONE) && (wp & btnmap[CTRL_ZAPPER][CTRLR_WIIMOTE][0]) )	// wiimote
-		#endif
-		)
-		{
-			// report trigger press
-			myzappers[z][2] |= 2;
-			zapper_triggered = true;
-		}
-
-		// VS zapper games
-		if ( (jp & btnmap[CTRL_ZAPPER][CTRLR_GCPAD][1])	// gamecube controller
-		#ifdef HW_RVL
-		|| ( (exp_type == WPAD_EXP_NONE) && (wp & btnmap[CTRL_ZAPPER][CTRLR_WIIMOTE][1]) )	// wiimote
-		#endif
-		)
-		{
-			FCEUI_VSUniCoin(); // insert coin for VS zapper games
-			zapper_triggered = true;
-		}
-
-		// cursor position
-		int channel = 0;	// by default, use wiimote 1
-		#ifdef HW_RVL
-		if (userInput[1].wpad->ir.valid)
-		{
-			channel = 1;	// if wiimote 2 is connected, use wiimote 2 as zapper
-		}
-		#endif
-		UpdateCursorPosition(channel); // update cursor for wiimote
-		myzappers[z][0] = pos_x;
-		myzappers[z][1] = pos_y;
-
-		// Report changes to FCE Ultra
-		zapperdata[z]->Update(z,myzappers[z],0);
-	}
-
-
 	// Report pressed buttons (gamepads)
 	int i;
 	for (i = 0; i < MAXJP; i++)
@ -531,8 +478,7 @@ static unsigned char DecodeJoy(unsigned short chan)
 		)
 		{
 			// if zapper is on, ignore all buttons except START and SELECT
-			//if(GCSettings.Controller != CTRL_ZAPPER || nespadmap[i] == JOY_START || nespadmap[i] == JOY_SELECT)
-			if (!zapper_triggered)
+			if(GCSettings.Controller != CTRL_ZAPPER || nespadmap[i] == JOY_START || nespadmap[i] == JOY_SELECT)
 			{
 				if(rapidAlternator && nespadmap[i] == RAPID_A)
 				{
@ -566,7 +512,47 @@ static unsigned char DecodeJoy(unsigned short chan)
 		}
 	}

+	// zapper enabled
+	if(GCSettings.Controller == CTRL_ZAPPER)
+	{
+		int z; // NES port # (0 or 1)

+		if(GameInfo->type == GIT_VSUNI)
+			z = 0;
+		else
+			z = 1;
+
+		myzappers[z][2] = 0; // reset trigger to not pressed
+
+		// is trigger pressed?
+		if ( (jp & btnmap[CTRL_ZAPPER][CTRLR_GCPAD][0])	// gamecube controller
+		#ifdef HW_RVL
+		|| ( (exp_type == WPAD_EXP_NONE) && (wp & btnmap[CTRL_ZAPPER][CTRLR_WIIMOTE][0]) )	// wiimote
+		#endif
+		)
+		{
+			// report trigger press
+			myzappers[z][2] |= 2;
+		}
+
+		// VS zapper games
+		if ( (jp & btnmap[CTRL_ZAPPER][CTRLR_GCPAD][1])	// gamecube controller
+		#ifdef HW_RVL
+		|| ( (exp_type == WPAD_EXP_NONE) && (wp & btnmap[CTRL_ZAPPER][CTRLR_WIIMOTE][1]) )	// wiimote
+		#endif
+		)
+		{
+			FCEUI_VSUniCoin(); // insert coin for VS zapper games
+		}
+
+		// cursor position
+		UpdateCursorPosition(0); // update cursor for wiimote 1
+		myzappers[z][0] = pos_x;
+		myzappers[z][1] = pos_y;
+
+		// Report changes to FCE Ultra
+		zapperdata[z]->Update(z,myzappers[z],0);
+	}

 	return J;
 }
@ -603,13 +589,12 @@ void GetJoy()

 	UpdatePads();

-// Turbo mode
-// RIGHT on c-stick and on classic ctrlr right joystick
-//	if(userInput[0].pad.substickX > 70 || userInput[0].WPAD_StickX(1) > 70 || userInput[0].wupcdata.substickX > 560)
-//		turbomode = 1;
-//	else
-//		turbomode = 0;
-	turbomode = 0;
+	// Turbo mode
+	// RIGHT on c-stick and on classic ctrlr right joystick
+	if(userInput[0].pad.substickX > 70 || userInput[0].WPAD_StickX(1) > 70 || userInput[0].wupcdata.substickX > 560)
+		turbomode = 1;
+	else
+		turbomode = 0;

 	// request to go back to menu
 	if(MenuRequested())
--- a/source/preferences.cpp
+++ b/source/preferences.cpp
@ -401,7 +401,7 @@ DefaultSettings ()
 	memset (&GCSettings, 0, sizeof (GCSettings));
 	ResetControls(); // controller button mappings

-	GCSettings.currpal = 0; // color palette
+	GCSettings.currpal = 1; // color palette
 	GCSettings.timing = 2; // 0 - NTSC, 1 - PAL, 2 - Automatic
 	GCSettings.videomode = 0; // automatic video mode detection
 	GCSettings.Controller = CTRL_PAD2; // NES pad, Four Score, Zapper
@ -419,11 +419,11 @@ DefaultSettings ()
 	GCSettings.yshift = 0; // vertical video shift

 	GCSettings.WiimoteOrientation = 0;
-	GCSettings.ExitAction = 0;
+	GCSettings.ExitAction = 0; // Auto
 	GCSettings.MusicVolume = 40;
 	GCSettings.SFXVolume = 40;
-	GCSettings.Rumble = 1;
-	GCSettings.DisplayVM = 1;
+	GCSettings.Rumble = 1; // Enabled
+	GCSettings.DisplayVM = 0; // Disabled
 #ifdef HW_RVL
 	GCSettings.language = CONF_GetLanguage();