From aab6391b12d1f25471ba0f756273ded11bc3adf5 Mon Sep 17 00:00:00 2001
From: nattthebear <goyuken@gmail.com>
Date: Mon, 29 May 2017 20:34:07 -0400
Subject: [PATCH] virtual boyee: actually fix the color config stuff

---
 .../Consoles/Nintendo/VB/LibVirtualBoyee.cs   |   5 +----
 output64/dll/vb.wbx                           | Bin 95246 -> 95246 bytes
 waterbox/vb/vb.cpp                            |  10 +++++-----
 waterbox/vb/vip.cpp                           |   4 ++--
 4 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/VB/LibVirtualBoyee.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/VB/LibVirtualBoyee.cs
index 5a5b3d9341..7504a8f271 100644
--- a/BizHawk.Emulation.Cores/Consoles/Nintendo/VB/LibVirtualBoyee.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/VB/LibVirtualBoyee.cs
@@ -105,10 +105,7 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.VB
 
 			private static int ConvertColor(Color c)
 			{
-				var v = c.ToArgb();
-				return v & 0xff00
-					| v << 16 & 0xff0000
-					| v >> 16 & 0xff;
+				return c.ToArgb();
 			}
 
 			public static NativeSettings FromFrontendSettings(VirtualBoyee.Settings s, VirtualBoyee.SyncSettings ss)
diff --git a/output64/dll/vb.wbx b/output64/dll/vb.wbx
index a79df26a57b3da06a6f8ddcb433380c60eb3cad0..562cb492b958dd1c6b797b66c40bfd61205fc209 100644
GIT binary patch
delta 273
zcmeBs!P@tNb;1p1vs|W)x0^PEy7G&><&Qd+2Be>)Ir3|q1hS&u{=WvIo}}@M97yAj
zI`G+*Kk@~Lc<|YgU*{@_I07Uh4;*|XaPR>~<0A%!{|u`C|1&UfUii$fb7AtPjR&)V
zW`NCe;n%pqA9Wna<=6NDvgbBLoL}TWzsNU`J-2~&{0BM$q(lU4*$uF*KpTF5?79pz
z^Ek{th-E-qk?h-iZxh!HeUKx7P5^@c46nCCXpoyge6R$V0uf+!+r_;ZziR*hc$9SG

delta 273
zcmeBs!P@tNb;1p1p-GGzZ#QiSb>!DL$sctr&6Qu|$^UC<{2~W{%%~@6{81o=$XgKa
z?Ppj1$OoSt`6CYi37sRK`E@RUgkBtcz;W=Afa?GM3=EBr7#RLDa9#i@xH@^$#)H}X
zBHw@pg3M2I;n%pqA9WmLzQzx*5Xee?k^fK|`J?{BEW8b}@HWV<9}o-qb&kXAyMe>L
r%bV|Q;+mlkbOjLn2SOm&{u)99-3I1^2p|UWK+XlSwu^f+e%Am1nE!O+

diff --git a/waterbox/vb/vb.cpp b/waterbox/vb/vb.cpp
index e7a73296d9..5c8a46fdcf 100644
--- a/waterbox/vb/vb.cpp
+++ b/waterbox/vb/vb.cpp
@@ -57,12 +57,12 @@ enum
 static const uint32 AnaglyphPreset_Colors[][2] =
 {
 	{0, 0},
-	{0x0000FF, 0xFF0000},
-	{0x0000FF, 0xEBB700},
-	{0x0000FF, 0xFFFF00},
-	{0x0000FF, 0x00FF00},
+	{0xFF0000, 0x0000FF},
+	{0xFF0000, 0x00B7EB},
+	{0xFF0000, 0x00FFFF},
+	{0xFF0000, 0x00FF00},
 	{0x00FF00, 0xFF00FF},
-	{0x00FFFF, 0xFF0000},
+	{0xFFFF00, 0x0000FF},
 };
 
 int32 VB_InDebugPeek;
diff --git a/waterbox/vb/vip.cpp b/waterbox/vb/vip.cpp
index baa4f2ec7a..9389e95ba4 100644
--- a/waterbox/vb/vip.cpp
+++ b/waterbox/vb/vip.cpp
@@ -105,7 +105,7 @@ static void MakeColorLUT()
 			const float g_prime = pow(g, 1.0 / 2.2);
 			const float b_prime = pow(b, 1.0 / 2.2);
 
-			ColorLUT[lr][i] = (int)(r_prime * 255) & 0xff | (int)(g_prime * 255) << 8 & 0xff00 | (int)(b_prime * 255) << 16 & 0xff0000 | 0xff000000;
+			ColorLUT[lr][i] = (int)(b_prime * 255) & 0xff | (int)(g_prime * 255) << 8 & 0xff00 | (int)(r_prime * 255) << 16 & 0xff0000 | 0xff000000;
 		}
 	}
 
@@ -132,7 +132,7 @@ static void MakeColorLUT()
 			g_prime = pow(g, 1.0 / 2.2);
 			b_prime = pow(b, 1.0 / 2.2);
 
-			AnaSlowColorLUT[l_b][r_b] = (int)(r_prime * 255) & 0xff | (int)(g_prime * 255) << 8 & 0xff00 | (int)(b_prime * 255) << 16 & 0xff0000 | 0xff000000;
+			AnaSlowColorLUT[l_b][r_b] = (int)(b_prime * 255) & 0xff | (int)(g_prime * 255) << 8 & 0xff00 | (int)(r_prime * 255) << 16 & 0xff0000 | 0xff000000;
 		}
 	}
 }