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

nyma cores - fixes to mnemonic lookups and add a few overrides

This commit is contained in:
adelikat 2020-06-15 13:43:23 -05:00
parent c8a0b6c323
commit cf3e1d51e0
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/BizHawk.Client.Common/movie/bk2/Bk2MnemonicLookup.cs
View File

@ -450,10 +450,10 @@ namespace BizHawk.Client.Common
["IV"] = '4', ["IV"] = '4',
["V"] = '5', ["V"] = '5',
["VI"] = '6', ["VI"] = '6',
["MODE 1: Set A"] = 'a', ["Mode 1: Set A"] = 'a',
["MODE 1: Set B"] = 'b', ["Mode 1: Set B"] = 'b',
["MODE 2: Set A"] = 'A', ["Mode 2: Set A"] = 'A',
["MODE 2: Set B"] = 'B' ["Mode 2: Set B"] = 'B'
}, },
["PCE"] = new Dictionary<string, char> ["PCE"] = new Dictionary<string, char>
{ {

11
src/BizHawk.Emulation.Cores/Waterbox/NymaCore.Controller.ButtonNameOverrides.cs
View File

@ -10,6 +10,12 @@ namespace BizHawk.Emulation.Cores.Waterbox
private static bool IsRomanNumeral(string str) private static bool IsRomanNumeral(string str)
=> new[] {"I", "II", "III", "IV", "V", "VI"}.Contains(str); => new[] {"I", "II", "III", "IV", "V", "VI"}.Contains(str);
private static readonly Dictionary<string, string> ButtonNameOverrides = new Dictionary<string, string>
{
["Left Shoulder"] = "L",
["Right Shoulder"] = "R"
};
/// <summary> /// <summary>
/// Override button names. Technically this should be per core, but a lot of the names and overrides are the same, /// Override button names. Technically this should be per core, but a lot of the names and overrides are the same,
/// and an override that doesn't apply to a particular core will just be ignored /// and an override that doesn't apply to a particular core will just be ignored
@ -23,6 +29,11 @@ namespace BizHawk.Emulation.Cores.Waterbox
original = CultureInfo.InvariantCulture.TextInfo.ToTitleCase(original.ToLowerInvariant()); original = CultureInfo.InvariantCulture.TextInfo.ToTitleCase(original.ToLowerInvariant());
} }
if (ButtonNameOverrides.ContainsKey(original))
{
original = ButtonNameOverrides[original];
}
// TODO: Add dictionaries or whatever here as needed // TODO: Add dictionaries or whatever here as needed
return original; return original;
} }