diff --git a/zsnes/src/cpu/regs.inc b/zsnes/src/cpu/regs.inc
index 84af5fe4..2a714e84 100644
--- a/zsnes/src/cpu/regs.inc
+++ b/zsnes/src/cpu/regs.inc
@@ -1115,11 +1115,14 @@ reg2Axxr:
 reg4016r:
     xor al,al
     test dword[JoyANow],80000000h
-    jnz .noal
-    rol dword[JoyANow],1
-    ret
+    jz .noal
+    mov al,01h
 .noal
-    mov al,1
+    rol dword[JoyANow],1
+    jz .zero
+    ret
+.zero
+    mov al,01h
     ret
 
 NEWSYM MultiTap, db 0
@@ -1132,11 +1135,14 @@ reg4017r:
 .nomultitap
     xor al,al
     test dword[JoyBNow],80000000h
-    jnz .noal
-    rol dword[JoyBNow],1
-    ret
+    jz .noal
+    mov al,01h
 .noal
-    mov al,1
+    rol dword[JoyBNow],1
+    jz .zero
+    ret
+.zero
+    mov al,01h
     ret
 .multitap
     test byte[MultiTapStat],1
@@ -1162,7 +1168,7 @@ reg4017r:
     xor al,al
     test dword[JoyDNow],80000000h
     jz .nojd
-    or al,1
+    or al,01h
 .nojd
     test dword[JoyENow],80000000h
     jz .noje