boot: add ability to load game rom in memory

choffmann · May 18, 2024 · 39d4cce · 39d4cce
1 parent 7974729
commit 39d4cce
Show file tree

Hide file tree

Showing 4 changed files with 59 additions and 46 deletions.
diff --git a/gameboy-bin/src/main.rs b/gameboy-bin/src/main.rs
@@ -5,10 +5,15 @@ use gameboy_lib::Gameboy;
 fn main() {
     println!("{}", std::env::current_dir().unwrap().display());
     let boot_rom = load_boot_rom();
-    let mut gameboy: Gameboy = Gameboy::new(boot_rom);
+    let rom = load_rom("./roms/tetris.gb");
+    let mut gameboy: Gameboy = Gameboy::new(boot_rom, rom);
     gameboy.start();
 }
 
 fn load_boot_rom() -> Vec<u8> {
     return std::fs::read("./boot_roms/dmg_boot.bin").expect("Error while reading boot rom");
 }
+
+fn load_rom(file: &str) -> Vec<u8> {
+    return std::fs::read(file).expect("Error while reading rom");
+}
diff --git a/gameboy-lib/src/cpu/command/misc_commands.rs b/gameboy-lib/src/cpu/command/misc_commands.rs
@@ -14,7 +14,7 @@ impl<'a> MiscCommand<'a> {
     }
 
     fn nop(&mut self) -> u16 {
-        self.cpu.pc.wrapping_add(0)
+        self.cpu.pc.wrapping_add(1)
     }
 
     fn swap(&mut self, from: &Register) -> u16 {