From cfc848bd2706de3ba3b7f70040b8e5da1925e6f2 Mon Sep 17 00:00:00 2001
From: CasualPokePlayer <50538166+CasualPokePlayer@users.noreply.github.com>
Date: Wed, 26 Jan 2022 19:29:51 -0800
Subject: [PATCH] default controls for dualshock/gamepad filled

---
 Assets/defctrl.json                             | 17 ++++++++++++++++-
 .../movie/bk2/Bk2MnemonicLookup.cs              |  2 +-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/Assets/defctrl.json b/Assets/defctrl.json
index c0b28cdb6b..80db7678ec 100644
--- a/Assets/defctrl.json
+++ b/Assets/defctrl.json
@@ -866,22 +866,37 @@
 		},
 		"PSX Front Panel": {
 			"P1 Up": "X1 DpadUp, Up",
+			"P1 D-Pad Up": "X1 DpadUp, Up",
+			"P1 Thumbstick Up": "X1 DpadUp, Up",
 			"P1 Down": "X1 DpadDown, Down",
+			"P1 D-Pad Down": "X1 DpadDown, Down",
+			"P1 Thumbstick Down": "X1 DpadDown, Down",
 			"P1 Left": "X1 DpadLeft, Left",
+			"P1 D-Pad Left": "X1 DpadLeft, Left",
+			"P1 Thumbstick Left": "X1 DpadLeft, Left",
 			"P1 Right": "X1 DpadRight, Right",
+			"P1 D-Pad Right": "X1 DpadRight, Right",
+			"P1 Thumbstick Right": "X1 DpadRight, Right",
 			"P1 Select": "X1 Back, Space",
 			"P1 Start": "X1 Start, Enter",
 			"P1 Square": "X1 X, A",
+			"P1 □": "X1 X, A",
 			"P1 Triangle": "X1 Y, S",
+			"P1 △": "X1 Y, S",
 			"P1 Circle": "X1 B, X",
+			"P1 ○": "X1 B, X",
 			"P1 Cross": "X1 A, Z",
+			"P1 X": "X1 A, Z",
 			"P1 L1": "X1 LeftShoulder, Q",
 			"P1 R1": "X1 RightShoulder, W",
 			"P1 L2": "X1 LeftTrigger, E",
 			"P1 R2": "X1 RightTrigger, R",
 			"P1 L3": "X1 LeftThumb, T",
+			"P1 Left Stick, Button": "X1 LeftThumb, T",
 			"P1 R3": "X1 RightThumb, Y",
-			"P1 MODE": "D"
+			"P1 Right Stick, Button": "X1 RightThumb, Y",
+			"P1 MODE": "D",
+			"P1 Analog": "D",
 		},
 		"Lynx Controller": {
 			"Up": "Up",
diff --git a/src/BizHawk.Client.Common/movie/bk2/Bk2MnemonicLookup.cs b/src/BizHawk.Client.Common/movie/bk2/Bk2MnemonicLookup.cs
index d39abb0d64..4d84ff9068 100644
--- a/src/BizHawk.Client.Common/movie/bk2/Bk2MnemonicLookup.cs
+++ b/src/BizHawk.Client.Common/movie/bk2/Bk2MnemonicLookup.cs
@@ -616,7 +616,7 @@ namespace BizHawk.Client.Common
 				["Right Stick, Pinky"] = 'p',
 				["Analog"] = 'M',
 				["Offscreen Shot"] = 'o',
-			}
+			},
 		};
 
 		private static readonly Dictionary<string, string> BaseAxisLookupTable = new Dictionary<string, string>