From fe7826f1da0d48bc93dd677c0b6563fc338ef907 Mon Sep 17 00:00:00 2001 From: adelikat Date: Mon, 29 Jul 2013 20:09:16 +0000 Subject: [PATCH] Controller Config - Add image for intellivision controller, add defaults for genesis controller --- BizHawk.MultiClient/config/NewControllerConfig.cs | 3 ++- BizHawk.MultiClient/output/defctrl.json | 11 +++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/BizHawk.MultiClient/config/NewControllerConfig.cs b/BizHawk.MultiClient/config/NewControllerConfig.cs index 551126cab2..4ac92b003f 100644 --- a/BizHawk.MultiClient/config/NewControllerConfig.cs +++ b/BizHawk.MultiClient/config/NewControllerConfig.cs @@ -19,11 +19,12 @@ namespace BizHawk.MultiClient.config ControllerImages.Add("GBA Controller", Properties.Resources.GBA_Controller); ControllerImages.Add("Dual Gameboy Controller", Properties.Resources.GBController); - ControllerImages.Add("ColecoVision Basic Controller", Properties.Resources.colecovisioncontroller); ControllerImages.Add("SMS Controller", Properties.Resources.SMSController); ControllerImages.Add("Genesis 3-Button Controller", Properties.Resources.GENController); ControllerImages.Add("Saturn Controller", Properties.Resources.SaturnController); + ControllerImages.Add("Intellivision Controller", Properties.Resources.IntVController); + ControllerImages.Add("ColecoVision Basic Controller", Properties.Resources.colecovisioncontroller); ControllerImages.Add("Atari 2600 Basic Controller", Properties.Resources.atari_controller); ControllerImages.Add("Atari 7800 ProLine Joystick Controller", Properties.Resources.A78Joystick); diff --git a/BizHawk.MultiClient/output/defctrl.json b/BizHawk.MultiClient/output/defctrl.json index 06625964e5..3941e431ad 100644 --- a/BizHawk.MultiClient/output/defctrl.json +++ b/BizHawk.MultiClient/output/defctrl.json @@ -457,6 +457,17 @@ "P2 B1": "", "P2 B2": "", }, + "Genesis 3-Button Controller": { + "Reset": "", + "P1 Up": "UpArrow, X1 DpadUp, X1 LStickUp", + "P1 Down": "DownArrow, X1 DpadDown, X1 LStickDown", + "P1 Left": "LeftArrow, X1 DpadLeft, X1 LStickLeft", + "P1 Right": "RightArrow, X1 DpadRight, X1 LStickRight", + "P1 A": "Z, J1 B1, X1 A", + "P1 B": "X, J1 B1, X1 B", + "P1 C": "C, J1 B4, X1 X", + "P1 Start": "Return, X1 J1 B10, X1 Start", + }, "Dual Gameboy Controller": { "P1 Up": "UpArrow, J1 POV1U, X1 DpadUp, X1 LStickUp", "P1 Down": "DownArrow, J1 POV1D, X1 DpadDown, X1 LStickDown",