From 51822a9ce11135881c4a3685abb64563bd8e23fa Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Sun, 1 Jun 2014 21:05:57 +0000
Subject: [PATCH] Wonderswan - virtualPad - fix movie playback

---
 .../tools/VirtualPads/VirtualPadForm.cs       |  9 +++++++
 .../tools/VirtualPads/VirtualPadWonderSawn.cs | 24 +++++++++----------
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadForm.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadForm.cs
index e1716c1a10..ea4785c000 100644
--- a/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadForm.cs
+++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadForm.cs
@@ -26,6 +26,15 @@ namespace BizHawk.Client.EmuHawk
 		{
 			get
 			{
+				if (Global.Emulator.SystemId == "WSWAN") // Hack - Wonderswan mnemonics violate the 1 controller per pipe rule
+				{
+					return new[]
+					{
+						Global.MovieSession.Movie
+						.GetInput(Global.Emulator.Frame) 
+					}.ToList();
+				}
+
 				return Global.MovieSession.Movie
 					.GetInput(Global.Emulator.Frame)
 					.Split(new[] { '|' }, StringSplitOptions.RemoveEmptyEntries)
diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadWonderSawn.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadWonderSawn.cs
index c80dfec51d..ef81bd5598 100644
--- a/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadWonderSawn.cs
+++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadWonderSawn.cs
@@ -131,20 +131,20 @@ namespace BizHawk.Client.EmuHawk
 		{
 			if (buttons.Length < 15) return;
 
-			if (buttons[0] == '.') PU.Checked = false; else PU.Checked = true;
-			if (buttons[1] == '.') PD.Checked = false; else PD.Checked = true;
-			if (buttons[2] == '.') PL.Checked = false; else PL.Checked = true;
-			if (buttons[3] == '.') PR.Checked = false; else PR.Checked = true;
+			if (buttons[1] == '.') PU.Checked = false; else PU.Checked = true;
+			if (buttons[2] == '.') PD.Checked = false; else PD.Checked = true;
+			if (buttons[3] == '.') PL.Checked = false; else PL.Checked = true;
+			if (buttons[4] == '.') PR.Checked = false; else PR.Checked = true;
 
-			if (buttons[5] == '.') PU2.Checked = false; else PU2.Checked = true;
-			if (buttons[6] == '.') PD2.Checked = false; else PD2.Checked = true;
-			if (buttons[7] == '.') PL2.Checked = false; else PL2.Checked = true;
-			if (buttons[8] == '.') PR2.Checked = false; else PR2.Checked = true;
+			if (buttons[6] == '.') PU2.Checked = false; else PU2.Checked = true;
+			if (buttons[7] == '.') PD2.Checked = false; else PD2.Checked = true;
+			if (buttons[8] == '.') PL2.Checked = false; else PL2.Checked = true;
+			if (buttons[9] == '.') PR2.Checked = false; else PR2.Checked = true;
 
-			if (buttons[10] == '.') BStart.Checked = false; else BStart.Checked = true;
-			if (buttons[11] == '.') BB.Checked = false; else BB.Checked = true;
-			if (buttons[12] == '.') BA.Checked = false; else BA.Checked = true;
-			if (buttons[13] == '.') BPower.Checked = false; else BPower.Checked = true;
+			if (buttons[11] == '.') BStart.Checked = false; else BStart.Checked = true;
+			if (buttons[12] == '.') BB.Checked = false; else BB.Checked = true;
+			if (buttons[13] == '.') BA.Checked = false; else BA.Checked = true;
+			if (buttons[14] == '.') BPower.Checked = false; else BPower.Checked = true;
 		}
 
 		private void Buttons_CheckedChanged(object sender, EventArgs e)