diff --git a/README.md b/README.md index 3d3d479a52dbce8b287ee9fd09551e56f5e87828..4be399a9348324062493dec115882456aacd6a39 100644 --- a/README.md +++ b/README.md @@ -31,6 +31,7 @@ cd dist && python3 -m http.server * [POKEGB: a gameboy emulator that only plays Pokémon blue](https://binji.github.io/posts/pokegb) * [Game Boy CPU Opcodes](https://izik1.github.io/gbops) * [Codeslinger - Game Boy](http://www.codeslinger.co.uk/pages/projects/gameboy.html) +* [Game Boy hardware database](https://gbhwdb.gekkio.fi) ### ROMs @@ -41,6 +42,7 @@ cd dist && python3 -m http.server * [GitHub - binji/binjgb (C)](https://github.com/binji/binjgb) * [GitHub - Rodrigodd/gameroy (Rust)](https://github.com/Rodrigodd/gameroy) * [GitHub - simias/gb-rs (Rust)](https://github.com/simias/gb-rs) +* [GitHub - RubenG123/frosty (Rust)](https://github.com/RubenG123/frosty) * [GitHub - calvinbaart/gameboy (TypeScript)](https://github.com/calvinbaart/gameboy) ### Videos diff --git a/examples/sdl/src/main.rs b/examples/sdl/src/main.rs index a847518700862c7b9c763d669dccce5d16297b4c..289cef91f98f85329b131230f25adcf04dadb2e5 100644 --- a/examples/sdl/src/main.rs +++ b/examples/sdl/src/main.rs @@ -84,14 +84,14 @@ fn main() { let mut game_boy = GameBoy::new(); game_boy.load_boot_default(); - //game_boy.load_rom_file("../../res/roms.prop/tetris.gb"); + game_boy.load_rom_file("../../res/roms.prop/tetris.gb"); //game_boy.load_rom_file("../../res/roms.prop/alleyway.gb"); //game_boy.load_rom_file("../../res/roms/firstwhite.gb"); //game_boy.load_rom_file("../../res/roms/opus5.gb"); //game_boy.load_rom_file("../../res/roms/paradius/cpu/01-special.gb"); // PASSED - game_boy.load_rom_file("../../res/roms/paradius/cpu/02-interrupts.gb"); + //game_boy.load_rom_file("../../res/roms/paradius/cpu/02-interrupts.gb"); //game_boy.load_rom_file("../../res/roms/paradius/cpu/03-op sp,hl.gb"); // PASSED //game_boy.load_rom_file("../../res/roms/paradius/cpu/04-op r,imm.gb"); // PASSED //game_boy.load_rom_file("../../res/roms/paradius/cpu/05-op rp.gb"); // PASSED @@ -166,8 +166,9 @@ fn key_to_pad(keycode: Keycode) -> PadKey { Keycode::Down => PadKey::Down, Keycode::Left => PadKey::Left, Keycode::Right => PadKey::Right, - Keycode::Space => PadKey::Start, - Keycode::Return => PadKey::Select, + Keycode::Return => PadKey::Start, + Keycode::Return2 => PadKey::Start, + Keycode::Space => PadKey::Select, Keycode::A => PadKey::A, Keycode::S => PadKey::B, _ => PadKey::A,