diff --git a/.gitignore b/.gitignore index 70b5e2aed9d02d5815b3d1e304e89755fb1c355d..4a77473d4e2bfae5eb94e3479d68b23fb65466ec 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,5 @@ Cargo.lock /.idea /target +/res/roms /examples/*/target diff --git a/examples/sdl/src/main.rs b/examples/sdl/src/main.rs index 6aa5f707872f40b3586aae99009034208faadc5c..8692010c7554758aa5a29dc9773fe3a9e414e47d 100644 --- a/examples/sdl/src/main.rs +++ b/examples/sdl/src/main.rs @@ -75,7 +75,7 @@ fn main() { let mut game_boy = GameBoy::new(); game_boy.load_boot_default(); - game_boy.load_rom("C:/Users/joamag/Desktop/tetris.gb"); + game_boy.load_rom("../../res/roms/tetris.gb"); let mut counter = 0; diff --git a/src/mmu.rs b/src/mmu.rs index a840ad230225922711b4d4868713070a775f8f75..f43396fd9112b7be6229239411de24ba8cdf3ab8 100644 --- a/src/mmu.rs +++ b/src/mmu.rs @@ -64,7 +64,7 @@ impl Mmu { 0x000 | 0x100 | 0x200 | 0x300 | 0x400 | 0x500 | 0x600 | 0x700 | 0x800 | 0x900 | 0xa00 | 0xb00 | 0xc00 | 0xd00 => self.ram[(addr & 0x1fff) as usize], 0xe00 => { - println!("READING FROM PPU OAM - NOT IMPLEMENTED"); + println!("Reading from PPU OAM - NOT IMPLEMENTED"); 0x00 } 0xf00 => { @@ -126,7 +126,7 @@ impl Mmu { self.ram[(addr & 0x1fff) as usize] = value; } 0xe00 => { - println!("WRITING TO PPU OAM"); + println!("Writing to PPU OAM"); } 0xf00 => { if addr >= 0xff80 { diff --git a/src/ppu.rs b/src/ppu.rs index f83abba004bbadc8d7b18dcddf242539af0397c7..16da0326e00099109a40fc74cfb9465c10c90c3f 100644 --- a/src/ppu.rs +++ b/src/ppu.rs @@ -241,7 +241,8 @@ impl Ppu { color_index => panic!("Invalid palette color index {:04x}", color_index), } } - } + }, + 0x007f => (), addr => panic!("Writing in unknown PPU location 0x{:04x}", addr), } }