Merge branch 'master' into joamag/audio-ch4

CHANGELOG.md

@@ -17,7 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
-*
+* Major JoyPad issue with Action/Select read in register
 
 ## [0.7.2] - 2023-03-04
 

doc/inspiration.md

@@ -20,12 +20,14 @@
 
 * [GitHub - LIJI32/SameBoy (C)](https://github.com/LIJI32/SameBoy)
 * [GitHub - binji/binjgb (C)](https://github.com/binji/binjgb)
+* [GitHub - 7thSamurai/Azayaka (C++)](https://github.com/7thSamurai/Azayaka)
 * [GitHub - feo-boy/feo-boy (Rust)](https://github.com/feo-boy/feo-boy)
 * [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)
 * [GitHub - djhworld/gomeboycolor-wasm (Go)](https://github.com/djhworld/gomeboycolor-wasm)
+* [GitHub - torch2424/wasmboy (WASM)](https://github.com/torch2424/wasmboy)
 
 ## Videos
 

src/pad.rs

@@ -5,6 +5,7 @@ use crate::warnln;
 
 #[derive(Clone, Copy, PartialEq, Eq)]
 pub enum PadSelection {
+    None,
     Action,
     Direction,
 }
@@ -45,7 +46,7 @@ impl Pad {
             select: false,
             b: false,
             a: false,
-            selection: PadSelection::Action,
+            selection: PadSelection::None,
             int_pad: false,
         }
     }
@@ -70,15 +71,12 @@ impl Pad {
                             | if self.up { 0x00 } else { 0x04 }
                             | if self.down { 0x00 } else { 0x08 })
                     }
+                    PadSelection::None => 0x0f,
                 };
-                value |= if self.selection == PadSelection::Direction {
-                    0x10
-                } else {
-                    0x00
-                } | if self.selection == PadSelection::Action {
-                    0x20
-                } else {
-                    0x00
+                value |= match self.selection {
+                    PadSelection::Action => 0x10,
+                    PadSelection::Direction => 0x20,
+                    PadSelection::None => 0x30,
                 };
                 value
             }
@@ -92,11 +90,12 @@ impl Pad {
     pub fn write(&mut self, addr: u16, value: u8) {
         match addr & 0x00ff {
             0x0000 => {
-                self.selection = if value & 0x10 == 0x00 {
-                    PadSelection::Direction
-                } else {
-                    PadSelection::Action
-                }
+                self.selection = match value & 0x30 {
+                    0x10 => PadSelection::Action,
+                    0x20 => PadSelection::Direction,
+                    0x30 => PadSelection::None,
+                    _ => PadSelection::None,
+                };
             }
             _ => warnln!("Writing to unknown Pad location 0x{:04x}", addr),
         }