More multimouse fixes

zsnes/src/init.asm

@@ -717,6 +717,17 @@ NEWSYM ReadInputDevice
     call JoyRead
     ; Process Data
     mov dword[JoyAOrig],0
+    mov dword[JoyBOrig],0
+
+    cmp byte[snesmouse],3
+    jne .nomultimouse
+    mov byte[MouseToRead],1
+    ProcSNESMouse JoyAOrig
+    mov byte[MouseToRead],2
+    ProcSNESMouse JoyBOrig
+    jmp .noinput2
+.nomultimouse
+
     ; Get Player1 input device
     cmp byte[snesmouse],1
     jne .nomouse1
@@ -774,13 +785,6 @@ NEWSYM ReadInputDevice
     ProcSNESMouse JoyBOrig
     jmp .noinput2
 .nomouse2
-    cmp byte[snesmouse],3
-    je .nomultimouse
-    mov byte[MouseToRead],1
-    ProcSNESMouse JoyAOrig
-    mov byte[MouseToRead],2
-    ProcSNESMouse JoyBOrig
-.nomultimouse
     cmp byte[snesmouse],4
     jne .nosuperscope
     call processmouse
@@ -980,7 +984,7 @@ NEWSYM ReadInputDevice
 .nopl1234
     ret
 .pl1234
-    cmp byte[snesmouse],4
+    cmp byte[snesmouse],5
     je .nopl1234
     cmp byte[snesmouse],1
     je .nopl13
@@ -989,7 +993,7 @@ NEWSYM ReadInputDevice
 .nopl13
     cmp byte[snesmouse],2
     je .nopl24
-    cmp byte[snesmouse],3
+    cmp byte[snesmouse],4
     je .nopl24
     mov eax,[JoyDOrig]
     or [JoyBOrig],eax

zsnes/src/video/procvid.asm

@@ -154,7 +154,7 @@ NEWSYM processmouse
     push ebx
     call Get_MouseData
     mov [mousebuttons],bx
-    cmp byte[snesmouse],3
+    cmp byte[snesmouse],4
     jne .ss
     cmp byte[pressed+13],0
     je .noautosw
@@ -220,9 +220,9 @@ NEWSYM processmouse
 .noneg
     mov [mousexpos],cx
 .noxchange
-    cmp byte[snesmouse],4
+    cmp byte[snesmouse],5
     je .le2
-    cmp byte[snesmouse],3
+    cmp byte[snesmouse],4
     jne .ss3
 .le2
     add word[mouseyloc],dx
@@ -3325,10 +3325,8 @@ NEWSYM vidpaste
     je .noclock
     call ClockOutput
 .noclock
-    cmp byte[snesmouse],3
+    cmp byte[snesmouse],4
     je near .drawss
-;    cmp byte[snesmouse],4
-;    je near .drawss
 .returnfromdraw
     mov ax,[resolutn]
     cmp [prevresolutn],ax