From 5f130aabd933843653ae8afb6b01f1f724c12574 Mon Sep 17 00:00:00 2001 From: zeromus Date: Tue, 8 Mar 2011 20:55:19 +0000 Subject: [PATCH] [NES] make ppu palette public --- BizHawk.Emulation/Consoles/Nintendo/NES/PPU.regs.cs | 2 +- BizHawk.MultiClient/NEStools/NESPPU.cs | 4 ++-- BizHawk.MultiClient/NEStools/PaletteViewer.cs | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/PPU.regs.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/PPU.regs.cs index 88133248d5..9dce82556b 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/PPU.regs.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/PPU.regs.cs @@ -288,7 +288,7 @@ namespace BizHawk.Emulation.Consoles.Nintendo Reg_2001 reg_2001; byte reg_2003; byte[] OAM; - byte[] PALRAM; + public byte[] PALRAM; bool vtoggle; byte VRAMBuffer; void regs_reset() diff --git a/BizHawk.MultiClient/NEStools/NESPPU.cs b/BizHawk.MultiClient/NEStools/NESPPU.cs index 07e1743d58..3c2ae9a6df 100644 --- a/BizHawk.MultiClient/NEStools/NESPPU.cs +++ b/BizHawk.MultiClient/NEStools/NESPPU.cs @@ -49,8 +49,8 @@ namespace BizHawk.MultiClient if (!this.IsHandleCreated || this.IsDisposed) return; for (int x = 0; x < 16; x++) { - PaletteView.bgPalettes[x].SetValue(Nes.ppu.ppubus_read(PaletteView.bgPalettes[x].address)); - PaletteView.spritePalettes[x].SetValue(Nes.ppu.ppubus_read(PaletteView.spritePalettes[x].address)); + PaletteView.bgPalettes[x].SetValue(Nes.ppu.PALRAM[PaletteView.bgPalettes[x].address]); + PaletteView.spritePalettes[x].SetValue(Nes.ppu.PALRAM[PaletteView.spritePalettes[x].address]); } PaletteView.Refresh(); } diff --git a/BizHawk.MultiClient/NEStools/PaletteViewer.cs b/BizHawk.MultiClient/NEStools/PaletteViewer.cs index c5fd286746..20b53ca7d6 100644 --- a/BizHawk.MultiClient/NEStools/PaletteViewer.cs +++ b/BizHawk.MultiClient/NEStools/PaletteViewer.cs @@ -56,8 +56,8 @@ namespace BizHawk.MultiClient for (int x = 0; x < 16; x++) { - bgPalettes[x] = new Palette(0x3F00 + x); - spritePalettes[x] = new Palette(0x3F10 + x); + bgPalettes[x] = new Palette(x); + spritePalettes[x] = new Palette(x); } }