From 8432471d774ec5de09e548d5c1ee413457f79d1c Mon Sep 17 00:00:00 2001
From: CasualPokePlayer <50538166+CasualPokePlayer@users.noreply.github.com>
Date: Wed, 26 Jan 2022 18:48:48 -0800
Subject: [PATCH] analog mnemonics

---
 .../movie/bk2/Bk2MnemonicLookup.cs               | 16 +++++++++++++++-
 .../vpads_schemata/PSXSchema.cs                  |  1 +
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/BizHawk.Client.Common/movie/bk2/Bk2MnemonicLookup.cs b/src/BizHawk.Client.Common/movie/bk2/Bk2MnemonicLookup.cs
index 87a5fef31f..d39abb0d64 100644
--- a/src/BizHawk.Client.Common/movie/bk2/Bk2MnemonicLookup.cs
+++ b/src/BizHawk.Client.Common/movie/bk2/Bk2MnemonicLookup.cs
@@ -644,7 +644,21 @@ namespace BizHawk.Client.Common
 			{
 				["VPos"] = "X",
 				["HPos"] = "Y"
-			}
+			},
+			[VSystemID.Raw.PSX] = new()
+			{
+				["Left Stick Left / Right"] = "lsX",
+				["Left Stick Up / Down"] = "lsY",
+				["Right Stick Left / Right"] = "rsX",
+				["Right Stick Up / Down"] = "rsY",
+				["Left Stick, Left / Right"] = "lsX",
+				["Left Stick, Fore / Back"] = "lsZ",
+				["Right Stick, Left / Right"] = "rsX",
+				["Right Stick, Fore / Back"] = "rsZ",
+				["Motion Left / Right"] = "mX",
+				["Motion Up / Down"] = "mY",
+				["Twist | / |"] = "Twist",
+			},
 		};
 	}
 }
diff --git a/src/BizHawk.Emulation.Cores/vpads_schemata/PSXSchema.cs b/src/BizHawk.Emulation.Cores/vpads_schemata/PSXSchema.cs
index adbb8920f3..f44268f4ba 100644
--- a/src/BizHawk.Emulation.Cores/vpads_schemata/PSXSchema.cs
+++ b/src/BizHawk.Emulation.Cores/vpads_schemata/PSXSchema.cs
@@ -331,6 +331,7 @@ namespace BizHawk.Emulation.Cores
 					},
 					new SingleAxisSchema(125, 15, controller, "Twist | / |", isVertical: true)
 					{
+						DisplayName = "Twist",
 						TargetSize = new Size(64, 178),
 						MinValue = 0,
 						MaxValue = 65535