From 3c267db54c72431d2f1705481d5c7b075d46c10a Mon Sep 17 00:00:00 2001 From: zeromus Date: Wed, 14 Mar 2012 21:35:07 +0000 Subject: [PATCH] add reset button to atari 2600 and add .a26 to multiclient filetypes list --- BizHawk.Emulation/Consoles/Atari/2600/Atari2600.cs | 2 +- BizHawk.MultiClient/MainForm.cs | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/BizHawk.Emulation/Consoles/Atari/2600/Atari2600.cs b/BizHawk.Emulation/Consoles/Atari/2600/Atari2600.cs index bc7aa5416f..5f959b86c6 100644 --- a/BizHawk.Emulation/Consoles/Atari/2600/Atari2600.cs +++ b/BizHawk.Emulation/Consoles/Atari/2600/Atari2600.cs @@ -34,7 +34,7 @@ namespace BizHawk Name = "Atari 2600 Basic Controller", BoolButtons = { - "P1 Up", "P1 Down", "P1 Left", "P1 Right", "P1 Button" + "P1 Up", "P1 Down", "P1 Left", "P1 Right", "P1 Button", "Reset" } }; diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs index 271122ea47..b8baebc5ac 100644 --- a/BizHawk.MultiClient/MainForm.cs +++ b/BizHawk.MultiClient/MainForm.cs @@ -2248,13 +2248,14 @@ namespace BizHawk.MultiClient ofd.InitialDirectory = PathManager.GetRomsPath(Global.Emulator.SystemId); //"Rom Files|*.NES;*.SMS;*.GG;*.SG;*.PCE;*.SGX;*.GB;*.BIN;*.SMD;*.ROM;*.ZIP;*.7z|NES (*.NES)|*.NES|Master System|*.SMS;*.GG;*.SG;*.ZIP;*.7z|PC Engine|*.PCE;*.SGX;*.ZIP;*.7z|Gameboy|*.GB;*.ZIP;*.7z|TI-83|*.rom|Archive Files|*.zip;*.7z|Savestate|*.state|All Files|*.*"; ofd.Filter = FormatFilter( - "Rom Files", "*.nes;*.sms;*.gg;*.sg;*.pce;*.sgx;*.bin;*.smd;*.rom;*.cue;*.exe;%ARCH%", + "Rom Files", "*.nes;*.sms;*.gg;*.sg;*.pce;*.sgx;*.bin;*.smd;*.rom;*.a26;*.cue;*.exe;%ARCH%", //"PSX Executables", "*.exe", "Disc Images", "*.cue", "NES", "*.nes;%ARCH%", "Master System", "*.sms;*.gg;*.sg;%ARCH%", "PC Engine", "*.pce;*.sgx;*.cue;%ARCH%", "TI-83", "*.rom;%ARCH%", + "Atari 2600", "*.a26;*.bin;%ARCH%", "Archive Files", "%ARCH%", "Savestate", "*.state", "Genesis (experimental)", "*.gen;*.smd;*.bin;*.cue;%ARCH%",