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 a79df26a57..562cb492b9 100644 Binary files a/output64/dll/vb.wbx and b/output64/dll/vb.wbx differ 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; } } }