diff --git a/src/consts.rs b/src/consts.rs index 46875497ef43aaa899282740c1e91e069ed94fa2..7a719e9903096897d2383725a12fda7386ac56a8 100644 --- a/src/consts.rs +++ b/src/consts.rs @@ -15,6 +15,8 @@ pub const SCX_ADDR: u16 = 0xff43; pub const LY_ADDR: u16 = 0xff44; pub const LYC_ADDR: u16 = 0xff45; pub const BGP_ADDR: u16 = 0xff47; +pub const OBP0_ADDR: u16 = 0xff48; +pub const OBP1_ADDR: u16 = 0xff49; // DMA registers pub const DMA_ADDR: u16 = 0xff46; diff --git a/src/ppu.rs b/src/ppu.rs index 74727e480d5b25ea09f68ce8a14317f3d9b9fde4..9f67341068b77c8fcb030c8c15d822f0a275c01c 100644 --- a/src/ppu.rs +++ b/src/ppu.rs @@ -15,7 +15,9 @@ use crate::{ rgb888_to_rgb565_u16, Pixel, PixelAlpha, RGB1555_SIZE, RGB565_SIZE, RGB888_SIZE, RGB_SIZE, XRGB8888_SIZE, }, - consts::{BGP_ADDR, LCDC_ADDR, LYC_ADDR, LY_ADDR, SCX_ADDR, SCY_ADDR, STAT_ADDR}, + consts::{ + BGP_ADDR, LCDC_ADDR, LYC_ADDR, LY_ADDR, OBP0_ADDR, OBP1_ADDR, SCX_ADDR, SCY_ADDR, STAT_ADDR, + }, gb::{GameBoyConfig, GameBoyMode}, mmu::BusComponent, util::SharedThread, @@ -809,10 +811,12 @@ impl Ppu { LY_ADDR => self.ly, // 0xFF45 — LYC LYC_ADDR => self.lyc, - // 0xFF47 — BGP: BG palette data (Non-CGB Mode only) + // 0xFF47 — BGP (Non-CGB Mode only) BGP_ADDR => self.palettes[0], - 0xff48 => self.palettes[1], - 0xff49 => self.palettes[2], + // 0xFF48 — OBP0 (Non-CGB Mode only) + OBP0_ADDR => self.palettes[1], + // 0xFF49 — OBP1 (Non-CGB Mode only) + OBP1_ADDR => self.palettes[2], 0xff4a => self.wy, 0xff4b => self.wx, // 0xFF4F — VBK (CGB only) @@ -893,7 +897,7 @@ impl Ppu { SCX_ADDR => self.scx = value, // 0xFF45 — LYC: LY compare LYC_ADDR => self.lyc = value, - // 0xFF47 — BGP: BG palette data (Non-CGB Mode only) + // 0xFF47 — BGP (Non-CGB Mode only) BGP_ADDR => { if value == self.palettes[0] { return; @@ -905,7 +909,8 @@ impl Ppu { } self.palettes[0] = value; } - 0xff48 => { + // 0xFF48 — OBP0 (Non-CGB Mode only) + OBP0_ADDR => { if value == self.palettes[1] { return; } @@ -920,7 +925,8 @@ impl Ppu { } self.palettes[1] = value; } - 0xff49 => { + // 0xFF49 — OBP0 (Non-CGB Mode only) + OBP1_ADDR => { if value == self.palettes[2] { return; } diff --git a/src/test.rs b/src/test.rs index 4c064b0c6344118ae7556b2efea28454edfc0f07..3837f1fd149df38072cab1437ecba5cb68243dd6 100644 --- a/src/test.rs +++ b/src/test.rs @@ -79,8 +79,8 @@ pub fn run_image_test( mod tests { use crate::{ consts::{ - BGP_ADDR, DIV_ADDR, DMA_ADDR, IF_ADDR, LCDC_ADDR, LYC_ADDR, LY_ADDR, SCX_ADDR, - SCY_ADDR, STAT_ADDR, TAC_ADDR, TIMA_ADDR, TMA_ADDR, + BGP_ADDR, DIV_ADDR, DMA_ADDR, IF_ADDR, LCDC_ADDR, LYC_ADDR, LY_ADDR, OBP0_ADDR, + OBP1_ADDR, SCX_ADDR, SCY_ADDR, STAT_ADDR, TAC_ADDR, TIMA_ADDR, TMA_ADDR, }, data::BootRom, }; @@ -120,6 +120,8 @@ mod tests { assert_eq!(result.ppu().read(LY_ADDR), 0x99); assert_eq!(result.ppu().read(LYC_ADDR), 0x00); assert_eq!(result.ppu().read(BGP_ADDR), 0xfc); + assert_eq!(result.ppu().read(OBP0_ADDR), 0x00); + assert_eq!(result.ppu().read(OBP1_ADDR), 0x00); assert_eq!(result.ppu().read(DMA_ADDR), 0xff); }