diff --git a/src/BizHawk.Client.Common/movie/bk2/Bk2MnemonicLookup.cs b/src/BizHawk.Client.Common/movie/bk2/Bk2MnemonicLookup.cs
index 97e4c378eb..c5c8d19479 100644
--- a/src/BizHawk.Client.Common/movie/bk2/Bk2MnemonicLookup.cs
+++ b/src/BizHawk.Client.Common/movie/bk2/Bk2MnemonicLookup.cs
@@ -554,6 +554,7 @@ namespace BizHawk.Client.Common
 				["Cup Select 1"] = '1',
 				["Cup Select 2"] = '2',
 				["Door Interlock"] = 'I',
+				["Effect"] = 'E',
 				["Emergency"] = 'E',
 				["Fierce Punch"] = 'F',
 				["Foot Pedal"] = 'P',
@@ -616,6 +617,7 @@ namespace BizHawk.Client.Common
 				["Stand"] = 'S',
 				["Strong"] = 's',
 				["Strong Punch"] = 'S',
+				["Test"] = 'T',
 				["Thrust"] = 'T',
 				["Tilt"] = 'T',
 				["Tilt 1"] = 't',
diff --git a/src/BizHawk.Emulation.Cores/Arcades/MAME/MAME.IInputPollable.cs b/src/BizHawk.Emulation.Cores/Arcades/MAME/MAME.IInputPollable.cs
index 12c5cec7a3..1b5b8ee87d 100644
--- a/src/BizHawk.Emulation.Cores/Arcades/MAME/MAME.IInputPollable.cs
+++ b/src/BizHawk.Emulation.Cores/Arcades/MAME/MAME.IInputPollable.cs
@@ -43,6 +43,8 @@ namespace BizHawk.Emulation.Cores.Arcades.MAME
 				fieldPtrList.Add(ptr);
 			}
 
+			MAMEController.BoolButtons.Add("Reset");
+
 			foreach (var buttonField in buttonFields)
 			{
 				if (buttonField != string.Empty && !buttonField.Contains('%'))
@@ -78,8 +80,6 @@ namespace BizHawk.Emulation.Cores.Arcades.MAME
 				}
 			}
 
-			MAMEController.BoolButtons.Add("Reset");
-
 			_buttonFields = buttonFieldList.ToArray();
 			_analogFields = analogFieldList.ToArray();
 			_fieldPtrs = fieldPtrList.ToArray();