sgb: revisit JOYP handling (#248)

devinacker · Feb 10, 2020 · c7a3bac · c7a3bac
1 parent b769e9d
commit c7a3bac
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 7 deletions.
diff --git a/supergameboy/interface/interface.cpp b/supergameboy/interface/interface.cpp
@@ -80,13 +80,19 @@ void SuperGameBoy::joyp_write(bool p15, bool p14) {
   //===============
 
   if(p15 == 1 && p14 == 1) {
-    if(joyp_lock == 0) {
-      joyp_lock = 1;
+    if(joyp14lock == 0) {
+      joyp14lock = 1;
       joyp_id = (joyp_id + 1) & mmio.mlt_req;
     }
   }
 
-  if(p14 == 1 && p15 == 0) joyp_lock ^= 1;
+  if(p15 == 0) {
+    if(joyp15lock == 1) {
+      joyp14lock ^= 1;
+	}
+  }
+
+  joyp15lock = p15;
 
   //===============
   //packet handling
@@ -217,7 +223,8 @@ void SuperGameBoy::serialize(nall::serializer &s) {
   s.integer(packetsize);
 
   s.integer(joyp_id);
-  s.integer(joyp_lock);
+  s.integer(joyp15lock);
+  s.integer(joyp14lock);
   s.integer(pulselock);
   s.integer(strobelock);
   s.integer(packetlock);
@@ -350,7 +357,8 @@ void SuperGameBoy::mmio_reset() {
   memset(vram, 0, 320*4);
 
   joyp_id = 0;
-  joyp_lock = 0;
+  joyp15lock = 0;
+  joyp14lock = 0;
   pulselock = true;
 }
 

diff --git a/supergameboy/interface/interface.hpp b/supergameboy/interface/interface.hpp
@@ -31,7 +31,8 @@ class SuperGameBoy : public gambatte::InputGetter, public gambatte::DebugHandler
   unsigned packetsize;
 
   unsigned joyp_id;
-  bool joyp_lock;
+  bool joyp15lock;
+  bool joyp14lock;
   bool pulselock;
   bool strobelock;
   bool packetlock;

diff --git a/supergameboy/libgambatte/src/memory.cpp b/supergameboy/libgambatte/src/memory.cpp
@@ -719,8 +719,8 @@ void Memory::nontrivial_ff_write(unsigned const p, unsigned data, unsigned long
 
 	switch (p & 0xFF) {
 	case 0x00:
-		supergameboy.joyp_write(data & 0x20, data & 0x10);
 		if ((data ^ ioamhram_[0x100]) & 0x30) {
+			supergameboy.joyp_write(data & 0x20, data & 0x10);
 			ioamhram_[0x100] = (ioamhram_[0x100] & ~0x30u) | (data & 0x30);
 			updateInput();
 		}