diff --git a/examples/web/index.ts b/examples/web/index.ts index ebc456c915ce6f14c756e05eeebdc923d19ce3d0..72242663ea4fccc30e4c7185173a3ce085784803 100644 --- a/examples/web/index.ts +++ b/examples/web/index.ts @@ -286,7 +286,7 @@ class GameboyEmulator extends EmulatorBase implements Emulator { break; } - //Â @todo replace this with somethign more flexible + //Â @TODO replace this with something more flexible this.gameBoy.set_palette_colors_ws([ "b6a571", "8b7e56", diff --git a/src/gb.rs b/src/gb.rs index 73af0a2529fa590ccf9efaf6c26cfcd070c12e4a..e248248d72851f1a9ea84e760b89ad0c4710abac 100644 --- a/src/gb.rs +++ b/src/gb.rs @@ -258,14 +258,14 @@ impl GameBoy { pub fn set_palette_colors_ws(&mut self, value: Vec<JsValue>) { let palette: Palette = value .into_iter() - .map(|v| self.convert_value(&v)) + .map(|v| Self::js_to_pixel(&v)) .collect::<Vec<Pixel>>() .try_into() .unwrap(); self.ppu().set_palette_colors(&palette); } - fn convert_value(&self, value: &JsValue) -> [u8; 3] { + fn js_to_pixel(value: &JsValue) -> [u8; 3] { value .as_string() .unwrap() diff --git a/src/mmu.rs b/src/mmu.rs index 4ffaef9ba1c2343c240f52b2042b371f990d4d3a..abe5aa46282a0995cd38699b8b9e7947baccc711 100644 --- a/src/mmu.rs +++ b/src/mmu.rs @@ -235,7 +235,7 @@ impl Mmu { 0x50 => match addr & 0x00ff { // 0xFF50 - Boot active flag 0x50 => self.boot_active = false, - + // 0xFF51-0xFF52 - VRAM DMA source (CGB only) 0x51..=0x52 => (),