From 513c1ca8ed708913f8972240fb4c1f192dd649cc Mon Sep 17 00:00:00 2001
From: feos <feykomylce@gmail.com>
Date: Sat, 7 Jun 2025 10:17:14 +0300
Subject: [PATCH] dsda: raven defaults and mnemonics

rename controller so all 3 games can share binds
---
 Assets/defctrl.json                             | 14 ++++++++++++--
 .../Base Implementations/Bk2MnemonicLookup.cs   | 17 +++++++++++++----
 .../Computers/Doom/DSDA.Controller.cs           |  2 +-
 3 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/Assets/defctrl.json b/Assets/defctrl.json
index 5380826dab..b1afc0d261 100644
--- a/Assets/defctrl.json
+++ b/Assets/defctrl.json
@@ -685,8 +685,8 @@
 			"P2 Joystick Button 2": "X",
 			"P2 Joystick Button 3": "C"
 		},
-		"Doom Input Format": {
-			"P1 Fire": "Ctrl,WMouse L",
+		"Doom Controller": {
+			"P1 Fire": "WMouse L",
 			"P1 Use": "Space",
 			"P1 Forward": "W",
 			"P1 Backward": "S",
@@ -701,6 +701,16 @@
 			"P1 Weapon Select 5": "Number5",
 			"P1 Weapon Select 6": "Number6",
 			"P1 Weapon Select 7": "Number7",
+			"P1 Inventory Left": "LeftBracket",
+			"P1 Inventory Right": "RightBracket",
+			"P1 Use Artifact": "Enter",
+			"P1 Look Up": "PageDown",
+			"P1 Look Down": "Delete",
+			"P1 Look Center": "End",
+			"P1 Fly Up": "PageUp",
+			"P1 Fly Down": "Insert",
+			"P1 Fly Center": "Home",
+			"P1 Jump": "Slash",
 			"Change Gamma": "F11",
 			"Automap Toggle": "Tab",
 			"Automap +": "KeypadAdd",
diff --git a/src/BizHawk.Emulation.Common/Base Implementations/Bk2MnemonicLookup.cs b/src/BizHawk.Emulation.Common/Base Implementations/Bk2MnemonicLookup.cs
index 45705ea21d..86b0774e0e 100644
--- a/src/BizHawk.Emulation.Common/Base Implementations/Bk2MnemonicLookup.cs	
+++ b/src/BizHawk.Emulation.Common/Base Implementations/Bk2MnemonicLookup.cs	
@@ -856,16 +856,25 @@ namespace BizHawk.Emulation.Common
 				["Backward"] = 'v',
 				["Change Gamma"] = 'G',
 				["End Player"] = 'E',
-				["Fire"] = 'F',
-				["Forward"] = '^',
-				["Jump"] = 'J',
+				["Fire"] = 'F',
+				["Fly Up"] = 'u',
+				["Fly Down"] = 'p',
+				["Fly Center"] = 'c',
+				["Forward"] = '^',
+				["Inventory Left"] = 'L',
+				["Inventory Right"] = 'R',
+				["Jump"] = 'J',
+				["Look Up"] = 'U',
+				["Look Down"] = 'D',
+				["Look Center"] = 'C',
 				["Run"] = 'R',
 				["Strafe"] = 'S',
 				["Strafe Left"] = '<',
 				["Strafe Right"] = '>',
 				["Turn Left"] = '{',
 				["Turn Right"] = '}',
-				["Use"] = 'U',
+				["Use"] = 'U',
+				["Use Artifact"] = 'A',
 				["Weapon Select 1"] = '1',
 				["Weapon Select 2"] = '2',
 				["Weapon Select 3"] = '3',
diff --git a/src/BizHawk.Emulation.Cores/Computers/Doom/DSDA.Controller.cs b/src/BizHawk.Emulation.Cores/Computers/Doom/DSDA.Controller.cs
index 29af424336..3443c8b4a7 100644
--- a/src/BizHawk.Emulation.Cores/Computers/Doom/DSDA.Controller.cs
+++ b/src/BizHawk.Emulation.Cores/Computers/Doom/DSDA.Controller.cs
@@ -8,7 +8,7 @@ namespace BizHawk.Emulation.Cores.Computers.Doom
 	{
 		public static ControllerDefinition CreateControllerDefinition(DoomSyncSettings settings)
 		{
-			var controller = new ControllerDefinition($"{settings.InputFormat} Input Format");
+			var controller = new ControllerDefinition($"Doom Controller");
 			var longtics = settings.TurningResolution == TurningResolution.Longtics;
 
 			for (int i = 0; i < 4; i++)