From 6700f50a9980644c5343918d8becaf7774f95edb Mon Sep 17 00:00:00 2001 From: zeromus Date: Sat, 7 Feb 2015 01:22:07 +0000 Subject: [PATCH] psx - fix small copypaste error in 2nd controller binding --- BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs b/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs index 62bc1988aa..2f8da831fe 100644 --- a/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs +++ b/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs @@ -360,12 +360,11 @@ namespace BizHawk.Emulation.Cores.Sony.PSX if (_SyncSettings.Controllers[0].IsConnected) { OctoshockDll.shock_Peripheral_Connect(psx, 0x01, lookup[_SyncSettings.Controllers[0].Type]); - } if (_SyncSettings.Controllers[1].IsConnected) { - OctoshockDll.shock_Peripheral_Connect(psx, 0x01, lookup[_SyncSettings.Controllers[1].Type]); + OctoshockDll.shock_Peripheral_Connect(psx, 0x02, lookup[_SyncSettings.Controllers[1].Type]); } //do this after framebuffers and peripherals and whatever crap are setup. kind of lame, but thats how it is for now