From 9885977e4fa9ae5e707cb4ac8e3138f4d8f5dccc Mon Sep 17 00:00:00 2001 From: "andres.delikat" Date: Sun, 13 Mar 2011 03:11:21 +0000 Subject: [PATCH] NES PPU - Palette Viewer - fix sprite palette display --- BizHawk.MultiClient/NEStools/NESPPU.cs | 2 +- BizHawk.MultiClient/NEStools/PaletteViewer.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/BizHawk.MultiClient/NEStools/NESPPU.cs b/BizHawk.MultiClient/NEStools/NESPPU.cs index fd92cfa03e..85d39ef08c 100644 --- a/BizHawk.MultiClient/NEStools/NESPPU.cs +++ b/BizHawk.MultiClient/NEStools/NESPPU.cs @@ -70,7 +70,7 @@ namespace BizHawk.MultiClient for (int x = 0; x < 16; x++) { PaletteView.bgPalettes[x].SetValue(Nes.LookupColor(Nes.ppu.PALRAM[PaletteView.bgPalettes[x].address])); - PaletteView.spritePalettes[x].SetValue(Nes.ppu.PALRAM[PaletteView.spritePalettes[x].address]); + PaletteView.spritePalettes[x].SetValue(Nes.LookupColor(Nes.ppu.PALRAM[PaletteView.spritePalettes[x].address])); } PaletteView.Refresh(); diff --git a/BizHawk.MultiClient/NEStools/PaletteViewer.cs b/BizHawk.MultiClient/NEStools/PaletteViewer.cs index e00755e78b..b87c7959da 100644 --- a/BizHawk.MultiClient/NEStools/PaletteViewer.cs +++ b/BizHawk.MultiClient/NEStools/PaletteViewer.cs @@ -58,7 +58,7 @@ namespace BizHawk.MultiClient for (int x = 0; x < 16; x++) { bgPalettes[x] = new Palette(x); - spritePalettes[x] = new Palette(x); + spritePalettes[x] = new Palette(x+16); } }