From 2a40b172e14e9c47b90378d303a5b008a2dd0e4e Mon Sep 17 00:00:00 2001 From: feos Date: Sat, 2 Dec 2023 20:53:37 +0300 Subject: [PATCH] fix #3704 --- src/BizHawk.Client.Common/movie/bk2/Bk2MnemonicLookup.cs | 3 +++ .../Arcades/MAME/MAME.IInputPollable.cs | 9 ++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/BizHawk.Client.Common/movie/bk2/Bk2MnemonicLookup.cs b/src/BizHawk.Client.Common/movie/bk2/Bk2MnemonicLookup.cs index 08de48748e..97e4c378eb 100644 --- a/src/BizHawk.Client.Common/movie/bk2/Bk2MnemonicLookup.cs +++ b/src/BizHawk.Client.Common/movie/bk2/Bk2MnemonicLookup.cs @@ -586,6 +586,8 @@ namespace BizHawk.Client.Common ["Pedal 2"] = '2', ["Push SW1 (Service)"] = 's', ["Push SW2 (Test)"] = 'T', + ["Push SW3 (Service)"] = 's', + ["Push SW4 (Test)"] = 'T', ["Red"] = 'R', ["Relay"] = 'R', ["Reverse"] = 'R', @@ -597,6 +599,7 @@ namespace BizHawk.Client.Common ["Sensor"] = 'S', ["Service"] = 'S', ["Service Mode"] = 'S', + ["Service Mode 2"] = 'S', ["Service Button"] = 'S', ["Service 1"] = 's', ["Service 2"] = 's', diff --git a/src/BizHawk.Emulation.Cores/Arcades/MAME/MAME.IInputPollable.cs b/src/BizHawk.Emulation.Cores/Arcades/MAME/MAME.IInputPollable.cs index e54db07eb6..12c5cec7a3 100644 --- a/src/BizHawk.Emulation.Cores/Arcades/MAME/MAME.IInputPollable.cs +++ b/src/BizHawk.Emulation.Cores/Arcades/MAME/MAME.IInputPollable.cs @@ -49,9 +49,16 @@ namespace BizHawk.Emulation.Cores.Arcades.MAME { var tag = buttonField.SubstringBefore(','); var field = buttonField.SubstringAfterLast(','); + var dupName = ""; buttonFieldList.Add(field); AddFieldPtr(tag, field); - MAMEController.BoolButtons.Add(field); + + if (MAMEController.BoolButtons.Contains(field)) + { + dupName = $" [{ tag }]"; + } + + MAMEController.BoolButtons.Add(field + dupName); } }