From a072879dca547cfeb4c92c114c18518e4b009174 Mon Sep 17 00:00:00 2001 From: adelikat Date: Sat, 28 Mar 2020 17:45:48 -0500 Subject: [PATCH] DS - fixes to dsm importer, add mnemonics for LidOpen and LidClose --- BizHawk.Client.Common/movie/bk2/Bk2MnemonicConstants.cs | 3 ++- BizHawk.Client.Common/movie/import/DsmImport.cs | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/BizHawk.Client.Common/movie/bk2/Bk2MnemonicConstants.cs b/BizHawk.Client.Common/movie/bk2/Bk2MnemonicConstants.cs index d01e89b862..fe6feb19d7 100644 --- a/BizHawk.Client.Common/movie/bk2/Bk2MnemonicConstants.cs +++ b/BizHawk.Client.Common/movie/bk2/Bk2MnemonicConstants.cs @@ -422,7 +422,8 @@ namespace BizHawk.Client.Common }, ["NDS"] = new Dictionary { - ["Lid"] = 'P', + ["LidOpen"] = 'o', + ["LidClose"] = 'c', ["Touch"] = 'T' }, ["O2"] = new Dictionary diff --git a/BizHawk.Client.Common/movie/import/DsmImport.cs b/BizHawk.Client.Common/movie/import/DsmImport.cs index de45f143d6..07539b5638 100644 --- a/BizHawk.Client.Common/movie/import/DsmImport.cs +++ b/BizHawk.Client.Common/movie/import/DsmImport.cs @@ -88,7 +88,7 @@ namespace BizHawk.Client.Common BoolButtons = { "Right", "Left", "Down", "Up", "Start", "Select", - "B", "A", "X", "Y", "L", "R", "Touch", "LidOpen", "LidClose" + "B", "A", "X", "Y", "L", "R", "LidOpen", "LidClose", "Touch" } } }; @@ -98,6 +98,9 @@ namespace BizHawk.Client.Common controller.Definition.FloatControls.Add("TouchY"); controller.Definition.FloatRanges.Add(new ControllerDefinition.AxisRange(0, 96, 191)); + controller["LidOpen"] = false; + controller["LidOpen"] = false; + string[] sections = line.Split(new[] {'|'}, StringSplitOptions.RemoveEmptyEntries); if (sections.Length > 0) {