Merge branch 'master' into release

TASEmulators · Jun 3, 2017 · 1882864 · 1882864
2 parents d96c4ab + cd7e6f4
commit 1882864
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/Assets/gamedb/gamedb_nes.txt b/Assets/gamedb/gamedb_nes.txt
@@ -276,6 +276,7 @@ sha1:D24D3104E28FD3F428CDBC8AE2D3F4ACA9A69D6F		Super Cartridge Ver 3 - 8 in 1 (A
 sha1:1477FD89A26B8F6E3460FE078794D79BEC944C00		Super Cartridge Ver 9 - 3 in 1 (Asia) (Unl)	NES		board=UNIF_UNL-Sachen-8259A;PRG=256;CHR=256;WRAM=0;VRAM=0
 sha1:5239EECED4510EF3D540DD39D629D9E7C5E55251		Taiwan Mahjong - Tai Wan Ma Que 16 (Asia) (Unl)	NES		board=UNIF_UNL-SA-0036;PRG=32;CHR=16;WRAM=0;VRAM=0;PAD_V=1;PAD_H=0
 sha1:C10C526F26273C4A1E180B968665910B74C78B86		Othello (Australia) (Unl)	NES		board=MAPPER000;PRG=16;CHR=8;WRAM=0;VRAM=0;PAD_V=0;PAD_H=1;system=NES-PAL
+sha1:2500B5492ECE1CAFB97881C5A384B0768313BF98		Block Out (USA) (Proto)	NES		board=MAPPER004;PRG=128;CHR=0;WRAM=8;VRAM=8;PAD_V=0;PAD_H=1
 
 ;;;;;;;;;;;;;;;;;;;-----------------------------------------------------------------------
 

diff --git a/BizHawk.Client.EmuHawk/MainForm.cs b/BizHawk.Client.EmuHawk/MainForm.cs
@@ -2140,7 +2140,7 @@ public static string RomFilter
 						"PlayStation", "*.cue;*.ccd;*.m3u",
 						"PSX Executables (experimental)", "*.exe",
 						"PSF Playstation Sound File", "*.psf;*.minipsf",
-						"Commodore 64 (experimental)", "*.prg; *.d64, *.g64; *.crt; *.tap;%ARCH%",
+						"Commodore 64", "*.prg; *.d64, *.g64; *.crt; *.tap;%ARCH%",
 						"SID Commodore 64 Music File", "*.sid;%ARCH%",
 						"Nintendo 64", "*.z64;*.v64;*.n64",
 						"WonderSwan", "*.ws;*.wsc;%ARCH%",
@@ -2149,7 +2149,7 @@ public static string RomFilter
 				}
 
 				return FormatFilter(
-					"Rom Files", "*.nes;*.fds;*.unf;*.sms;*.gg;*.sg;*.gb;*.gbc;*.gba;*.pce;*.sgx;*.bin;*.smd;*.gen;*.md;*.smc;*.sfc;*.a26;*.a78;*.lnx;*.col;*.int;*.rom;*.m3u;*.cue;*.ccd;*.sgb;*.z64;*.v64;*.n64;*.ws;*.wsc;*.xml;*.dsk;*.do;*.po;*.psf;*.minipsf;*.nsf;%ARCH%",
+					"Rom Files", "*.nes;*.fds;*.unf;*.sms;*.gg;*.sg;*.gb;*.gbc;*.gba;*.pce;*.sgx;*.bin;*.smd;*.gen;*.md;*.smc;*.sfc;*.a26;*.a78;*.lnx;*.col;*.int;*.rom;*.m3u;*.cue;*.ccd;*.sgb;*.z64;*.v64;*.n64;*.ws;*.wsc;*.xml;*.dsk;*.do;*.po;*.psf;*.prg;*.d64;*.g64;*.minipsf;*.nsf;%ARCH%",
 					"Disc Images", "*.cue;*.ccd;*.m3u",
 					"NES", "*.nes;*.fds;*.unf;*.nsf;%ARCH%",
 					"Super NES", "*.smc;*.sfc;*.xml;%ARCH%",
@@ -2171,6 +2171,7 @@ public static string RomFilter
 					"Genesis", "*.gen;*.md;*.smd;*.bin;*.cue;*.ccd;%ARCH%",
 					"WonderSwan", "*.ws;*.wsc;%ARCH%",
 					"Apple II", "*.dsk;*.do;*.po;%ARCH%",
+					"Commodore 64", "*.prg; *.d64, *.g64; *.crt; *.tap;%ARCH%",
 					"All Files", "*.*");
 			}
 		}