ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

finish wiring up reset control for gameboy. i recorded and played back a movie containing a "soft reset", and it worked correctly.

This commit is contained in:
goyuken 2012-09-15 16:59:21 +00:00
parent 77d0ff8ac8
commit a8fb28f652
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BizHawk.MultiClient/Global.cs
View File

@ -118,7 +118,7 @@ namespace BizHawk.MultiClient
public static readonly Dictionary<string, Dictionary<string, string>> COMMANDS = new Dictionary<string, Dictionary<string, string>>() public static readonly Dictionary<string, Dictionary<string, string>> COMMANDS = new Dictionary<string, Dictionary<string, string>>()
{ {
{"Atari 2600 Basic Controller", new Dictionary<string, string>() {{"Reset", "r"}, {"Select", "s"}}}, {"Atari 2600 Basic Controller", new Dictionary<string, string>() {{"Reset", "r"}, {"Select", "s"}}},
{"Gameboy Controller", new Dictionary<string, string>() {}}, {"Gameboy Controller", new Dictionary<string, string>() {{"Reset", "r"}}},
{"Genesis 3-Button Controller", new Dictionary<string, string>() {}}, {"Genesis 3-Button Controller", new Dictionary<string, string>() {}},
{"NES Controller", new Dictionary<string, string>() {{"Reset", "r"}}}, {"NES Controller", new Dictionary<string, string>() {{"Reset", "r"}}},
{"SNES Controller", new Dictionary<string, string>() {{"Reset", "r"}}}, {"SNES Controller", new Dictionary<string, string>() {{"Reset", "r"}}},

9
BizHawk.MultiClient/movie/InputAdapters.cs
View File

@ -395,7 +395,7 @@ namespace BizHawk.MultiClient
StringBuilder input = new StringBuilder("|"); StringBuilder input = new StringBuilder("|");
if ( if (
ControlType == "Genesis 3-Button Controller" || ControlType == "Gameboy Controller" || ControlType == "Genesis 3-Button Controller" || // ControlType == "Gameboy Controller" ||
ControlType == "PC Engine Controller" ControlType == "PC Engine Controller"
) )
{ {
@ -406,7 +406,7 @@ namespace BizHawk.MultiClient
input.Append(IsBasePressed("Reset") ? "r" : "."); input.Append(IsBasePressed("Reset") ? "r" : ".");
input.Append(IsBasePressed("Select") ? "s" : "."); input.Append(IsBasePressed("Select") ? "s" : ".");
} }
if (ControlType == "NES Controller") if (ControlType == "NES Controller" || ControlType == "Gameboy Controller")
{ {
input.Append(IsBasePressed("Reset") ? Global.COMMANDS[ControlType]["Reset"] : "."); input.Append(IsBasePressed("Reset") ? Global.COMMANDS[ControlType]["Reset"] : ".");
} }
@ -645,6 +645,11 @@ namespace BizHawk.MultiClient
if (mnemonic.Length < 2) return; if (mnemonic.Length < 2) return;
Force("Reset", mnemonic[1] != '.' && mnemonic[1] != '0' && mnemonic[1] != 'l'); Force("Reset", mnemonic[1] != '.' && mnemonic[1] != '0' && mnemonic[1] != 'l');
} }
if (ControlType == "Gameboy Controller")
{
if (mnemonic.Length < 2) return;
Force("Reset", mnemonic[1] != '.');
}
if (ControlType == "SMS Controller" || ControlType == "TI83 Controller") if (ControlType == "SMS Controller" || ControlType == "TI83 Controller")
{ {
start = 1; start = 1;