From bf22476a7d198a7999d776ab5813528cb9e04433 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Magalh=C3=A3es?= <joamag@gmail.com>
Date: Thu, 7 Jul 2022 13:51:04 +0100
Subject: [PATCH] fix: some keys Also added some links to README
---
README.md | 2 ++
examples/sdl/src/main.rs | 9 +++++----
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/README.md b/README.md
index 3d3d479a..4be399a9 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 a8475187..289cef91 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,
--
GitLab