Ported draw-cursor

src/manifest.tal

@@ -5,6 +5,14 @@
 
 BRK
 
+@draw-cursor ( color -- )
+
+	.cursor/x LDZ2 .Screen/x DEO2
+	.cursor/y LDZ2 .Screen/y DEO2
+	.Screen/sprite DEO
+
+JMP2r
+
 @on-mouse-menu ( -> )
 
 	( clear last cursor )

src/nasu.tal

@@ -138,9 +138,7 @@ JMP2r
 	;on-button-trap .Controller/vector DEO2
 	;on-mouse-trap .Mouse/vector DEO2
 	( clear cursor )
-	.cursor/x LDZ2 .Screen/x DEO2
-	.cursor/y LDZ2 .Screen/y DEO2
-	#40 .Screen/sprite DEO
+	#40 ;draw-cursor JSR2
 	( release mouse ) #00 .Mouse/state DEO
 
 JMP2r
@@ -222,7 +220,14 @@ BRK
 
 	.Mouse/y DEI2 #000c LTH2 ;trap-menu JCN2
 
-	;draw-cursor JSR2
+	( clear last cursor )
+	#40 ;draw-cursor JSR2
+	( record mouse positions )
+	.Mouse/x DEI2 DUP2 .cursor/x STZ2 .Screen/x DEO2
+	.Mouse/y DEI2 DUP2 .cursor/y STZ2 .Screen/y DEO2
+	( draw new cursor )
+	;brush-icn #00 .settings/tool LDZ #30 SFT ADD2 .Screen/addr DEO2
+	#42 .Mouse/state DEI #00 NEQ ADD .Screen/sprite DEO
 
 	.Mouse/state DEI #00 EQU ,&no-touch JCN
 		.Mouse/x DEI2 .Mouse/y DEI2 .tileview ;within-rect JSR2 ;on-touch-tileview JCN2
@@ -997,21 +1002,6 @@ JMP2r
 
 JMP2r
 
-@draw-cursor ( -- )
-
-	( clear last cursor )
-	.cursor/x LDZ2 .Screen/x DEO2
-	.cursor/y LDZ2 .Screen/y DEO2
-	#40 .Screen/sprite DEO
-	( record mouse positions )
-	.Mouse/x DEI2 DUP2 .cursor/x STZ2 .Screen/x DEO2
-	.Mouse/y DEI2 DUP2 .cursor/y STZ2 .Screen/y DEO2
-	( draw new cursor )
-	;brush-icn #00 .settings/tool LDZ #30 SFT ADD2 .Screen/addr DEO2
-	#42 .Mouse/state DEI #00 NEQ ADD .Screen/sprite DEO
-
-JMP2r
-
 @draw-state ( -- )
 
 	.toolview/x2 LDZ2 #0008 SUB2 .Screen/x DEO2