From 4bfdfd31c6fd0e5f2399c957720c35d223d9016f Mon Sep 17 00:00:00 2001 From: adelikat Date: Tue, 17 Dec 2013 01:46:23 +0000 Subject: [PATCH] add Genesis controller to controller config for GPGX, and oops, mnemonics now do 2nd player controller --- BizHawk.Client.Common/movie/MovieMnemonics.cs | 2 +- BizHawk.Client.EmuHawk/config/ControllerConfig.cs | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/BizHawk.Client.Common/movie/MovieMnemonics.cs b/BizHawk.Client.Common/movie/MovieMnemonics.cs index 381b74dfed..39fb0d0c6d 100644 --- a/BizHawk.Client.Common/movie/MovieMnemonics.cs +++ b/BizHawk.Client.Common/movie/MovieMnemonics.cs @@ -159,7 +159,7 @@ namespace BizHawk.Client.Common public static readonly Dictionary PLAYERS = new Dictionary { - {"Gameboy Controller", 1}, {"GBA Controller", 1}, {"Genesis 3-Button Controller", 2}, {"GPGX Genesis Controller", 1}, {"NES Controller", 4}, + {"Gameboy Controller", 1}, {"GBA Controller", 1}, {"Genesis 3-Button Controller", 2}, {"GPGX Genesis Controller", 2}, {"NES Controller", 4}, {"SNES Controller", 4}, {"PC Engine Controller", 5}, {"SMS Controller", 2}, {"TI83 Controller", 1}, {"Atari 2600 Basic Controller", 2}, {"Atari 7800 ProLine Joystick Controller", 2}, {"ColecoVision Basic Controller", 2}, {"Commodore 64 Controller", 2}, {"Nintento 64 Controller", 4}, {"Saturn Controller", 2} }; diff --git a/BizHawk.Client.EmuHawk/config/ControllerConfig.cs b/BizHawk.Client.EmuHawk/config/ControllerConfig.cs index 3cca646bd8..7cbe669dff 100644 --- a/BizHawk.Client.EmuHawk/config/ControllerConfig.cs +++ b/BizHawk.Client.EmuHawk/config/ControllerConfig.cs @@ -24,6 +24,7 @@ namespace BizHawk.Client.EmuHawk ControllerImages.Add("SMS Controller", Properties.Resources.SMSController); ControllerImages.Add("Genesis 3-Button Controller", Properties.Resources.GENController); + ControllerImages.Add("GPGX Genesis Controller", Properties.Resources.GENController); ControllerImages.Add("Saturn Controller", Properties.Resources.SaturnController); ControllerImages.Add("Intellivision Controller", Properties.Resources.IntVController);