From 91515d510db77ab3c0d29f08606238625e3da20e Mon Sep 17 00:00:00 2001
From: Peter Ferrie <peter.ferrie@gmail.com>
Date: Tue, 6 Mar 2018 15:13:14 -0800
Subject: [PATCH] rename file and document 65816 detection

---
 mouse.s                  |  4 ++++
 mouse.gs.s => mouse_gs.s | 13 ++++++-------
 weegui.s                 |  2 +-
 3 files changed, 11 insertions(+), 8 deletions(-)
 rename mouse.gs.s => mouse_gs.s (85%)

diff --git a/mouse.s b/mouse.s
index 2269eec..96bf2e6 100644
--- a/mouse.s
+++ b/mouse.s
@@ -75,6 +75,10 @@ WGEnableMouse:
 
 	SETSWITCH PAGE2OFF
 
+	; Warning!
+	; We're relying on the fact that the 65C02 treats undefined opcodes as NOPs here!	
+	; (in the same way that ProDOS 2.4.2 does)
+
 	sec
 	.byte $C2, $01 ;REP #$01	; clear carry flag on 65816
 	bcc WGEnableMouse_IIGS
diff --git a/mouse.gs.s b/mouse_gs.s
similarity index 85%
rename from mouse.gs.s
rename to mouse_gs.s
index 1f0f75d..e88a500 100644
--- a/mouse.gs.s
+++ b/mouse_gs.s
@@ -41,7 +41,7 @@ GS_Mouse_CheckX:
 	.byte $C2, $30 ;rep #$30 ;16-bit A,X,Y
 	.byte $A2, <MousePixX, >MousePixX ;ldx #MousePixX
 	jsr GS_Mouse_AddDelta ;Cvt to signed word, add to pixPos & range clamp
-	.byte $9D, <(MouseTxtX-MousePixX), >(MouseTxtX-MousePixX) ;sta MouseTxtX-MousePixX,x ;16-bit store overwrites Y
+	.byte $95, MouseTxtX-MousePixX ;sta MouseTxtX-MousePixX,x ;16-bit store overwrites Y
 GS_Mouse_CheckY:
 	tya ;a=DeltaY
 	inx
@@ -56,13 +56,11 @@ GS_Mouse_CheckY:
 	eor MouseBtn0-MousePixY,x ;Remove old button0
 	sta MouseBtn0-MousePixY,x ;Save new button0
 	bmi GS_Mouse_NoDownEdge
-	.byte $BC, <(MouseTxtX-MousePixY), >(MouseTxtX-MousePixY) ;ldy MouseTxtX-MousePixY,x
+	ldy MouseTxtX-MousePixY,x
 	sty MouseDownX ;Set WG_MOUSECLICK_X & WG_MOUSECLICK_Y
 GS_Mouse_NoDownEdge:
 	.byte $FB ;xce ;65816 emulation mode: 8-bit A,X,Y
-	jsr WGDrawPointer				; Redraw the pointer
-GS_Mouse_Exit:
-	rts
+	jmp WGDrawPointer				; Redraw the pointer
 
 ;-------------------------------
 
@@ -78,15 +76,16 @@ GS_Mouse_GotDelta:
 	bpl GS_Mouse_NoMinClamp
 	.byte $7B ;tdc ;Clamp neg position to zero
 GS_Mouse_NoMinClamp:
-	.byte $DD, <(MouseMaxX-MousePixX), >(MouseMaxX-MousePixX) ;cmp MouseMaxX-MousePixX,x
+	cmp MouseMaxX-MousePixX,x
 	bcc GS_Mouse_NoMaxClamp
-	.byte $BD, <(MouseMaxX-MousePixX), >(MouseMaxX-MousePixX) ;lda MouseMaxX-MousePixX,x
+	lda MouseMaxX-MousePixX,x
 	dec
 GS_Mouse_NoMaxClamp:
 	sta 0,x ;Store mouse pixel position
 	lsr ;TextPos = PixelPos / 8
 	lsr
 	lsr
+GS_Mouse_Exit:
 	rts
 
 GsDisableMouse:
diff --git a/weegui.s b/weegui.s
index 2c44dde..33f697e 100644
--- a/weegui.s
+++ b/weegui.s
@@ -182,7 +182,7 @@ WG80:
 .include "rects.s"
 .include "views.s"
 .include "mouse.s"
-.include "mouse.gs.s"
+.include "mouse_gs.s"
 .include "applesoft.s"
 .include "memory.s"