From 810979dab25f581bb548d068f8296f81b162431e Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Mon, 19 Jun 2017 12:49:13 -0500
Subject: [PATCH] Fix defctrl.json json parse error, Saturn keyboard - change
 names of keyboard R and L to not collide with the controller button names

---
 Assets/defctrl.json                                       | 5 +++--
 .../Consoles/Sega/Saturn/SaturnusControllerDeck.cs        | 8 ++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Assets/defctrl.json b/Assets/defctrl.json
index 4d832066d7..e329f90441 100644
--- a/Assets/defctrl.json
+++ b/Assets/defctrl.json
@@ -543,7 +543,7 @@
       "P1 Q": "Q",
       "P1 W": "W",
       "P1 E": "E",
-      "P1 R": "R",
+      "P1 R(Key)": "R",
       "P1 T": "T",
       "P1 Y(Key)": "Y",
       "P1 U": "U",
@@ -562,7 +562,7 @@
       "P1 H": "H",
       "P1 J": "J",
       "P1 K": "K",
-      "P1 L": "L",
+      "P1 L(Key)": "L",
       "P1 Semicolon;": "Semicolon",
       "P1 Quote'": "Apostrophe",
       "P1 LeftShift": "LeftShift",
@@ -1495,5 +1495,6 @@
         "Mult": 1.0,
         "Deadzone": 0.1
       }
+    }
   }
 }
\ No newline at end of file
diff --git a/BizHawk.Emulation.Cores/Consoles/Sega/Saturn/SaturnusControllerDeck.cs b/BizHawk.Emulation.Cores/Consoles/Sega/Saturn/SaturnusControllerDeck.cs
index fd136fb93b..03ddcbfefb 100644
--- a/BizHawk.Emulation.Cores/Consoles/Sega/Saturn/SaturnusControllerDeck.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Sega/Saturn/SaturnusControllerDeck.cs
@@ -452,7 +452,7 @@ namespace BizHawk.Emulation.Cores.Consoles.Sega.Saturn
 				"V",
 				"F",
 				"T",
-				"R",
+				"R(Key)",
 				"5",
 				null,
 				null,
@@ -482,7 +482,7 @@ namespace BizHawk.Emulation.Cores.Consoles.Sega.Saturn
 				null,
 				"Period.",
 				"Slash/",
-				"L",
+				"L(Key)",
 				"Semicolon;",
 				"P",
 				"Minus-",
@@ -592,7 +592,7 @@ namespace BizHawk.Emulation.Cores.Consoles.Sega.Saturn
 					case "Q": return 201;
 					case "W": return 202;
 					case "E": return 203;
-					case "R": return 204;
+					case "R(Key)": return 204;
 					case "T": return 205;
 					case "Y(Key)": return 206;
 					case "U": return 207;
@@ -612,7 +612,7 @@ namespace BizHawk.Emulation.Cores.Consoles.Sega.Saturn
 					case "H": return 306;
 					case "J": return 307;
 					case "K": return 308;
-					case "L": return 309;
+					case "L(Key)": return 309;
 					case "Semicolon;": return 310;
 					case "Quote'": return 311;