From 2810a048f02b50371d142972ccc69ea376f857d3 Mon Sep 17 00:00:00 2001 From: goyuken Date: Sun, 16 Sep 2012 14:36:42 +0000 Subject: [PATCH] fix two minor ColorChooserForm bugs add "bsnes v087.pal" --- BizHawk.MultiClient/GBtools/ColorChooserForm.cs | 4 +++- .../output/Gameboy/Palettes/bsnes v087.pal | 13 +++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 BizHawk.MultiClient/output/Gameboy/Palettes/bsnes v087.pal diff --git a/BizHawk.MultiClient/GBtools/ColorChooserForm.cs b/BizHawk.MultiClient/GBtools/ColorChooserForm.cs index 68360562e4..f8543a0329 100644 --- a/BizHawk.MultiClient/GBtools/ColorChooserForm.cs +++ b/BizHawk.MultiClient/GBtools/ColorChooserForm.cs @@ -130,9 +130,10 @@ namespace BizHawk.MultiClient.GBtools // custom colors are ints, not Color structs? // and they don't work right unless the alpha bits are set to 0 + // and the rgb order is switched int[] customs = new int[12]; for (int j = 0; j < customs.Length; j++) - customs[j] = colors[j].ToArgb() & 0xffffff; + customs[j] = colors[j].R | colors[j].G << 8 | colors[j].B << 16; dlg.CustomColors = customs; dlg.FullOpen = true; @@ -300,6 +301,7 @@ namespace BizHawk.MultiClient.GBtools currentfile = filename; filemodified = false; label4.Text = "Current palette file:"; + textBox1.Text = Path.GetFileName(filename); } } catch diff --git a/BizHawk.MultiClient/output/Gameboy/Palettes/bsnes v087.pal b/BizHawk.MultiClient/output/Gameboy/Palettes/bsnes v087.pal new file mode 100644 index 0000000000..5d2bc8c770 --- /dev/null +++ b/BizHawk.MultiClient/output/Gameboy/Palettes/bsnes v087.pal @@ -0,0 +1,13 @@ +[General] +Background0=10140421 +Background1=9087749 +Background2=1922333 +Background3=337157 +Sprite%2010=10140421 +Sprite%2011=9087749 +Sprite%2012=1922333 +Sprite%2013=337157 +Sprite%2020=10140421 +Sprite%2021=9087749 +Sprite%2022=1922333 +Sprite%2023=337157