2 files changed, 13 insertions(+), 18 deletions(-)

M src/manifest.tal
M src/orca.tal

@@ 307,15 307,16 @@ JMP2r
 
 @update-cursor ( color addr* -- )
 
+	#00 .Screen/auto DEO
 	#40 draw-cursor
-	.Mouse/x DEI2 .cursor/x STZ2
-	.Mouse/y DEI2 .cursor/y STZ2
+	.Mouse/x DEI2 ,draw-cursor/x STR2
+	.Mouse/y DEI2 ,draw-cursor/y STR2
 	.Screen/addr DEO2
 
 @draw-cursor ( color -- )
 
-	.cursor/x LDZ2 .Screen/x DEO2
-	.cursor/y LDZ2 .Screen/y DEO2
+	[ LIT2 &x $2 ] .Screen/x DEO2
+	[ LIT2 &y $2 ] .Screen/y DEO2
 	.Screen/sprite DEO
 
 JMP2r


@@ 347,14 348,7 @@ JMP2r
 @scat ( src* dst* -- ) scap
 @scpy ( src* dst* -- ) STH2 &w LDAk STH2kr STA INC2r INC2 LDAk ?&w POP2 #00 STH2r STA JMP2r
 @mclr ( src* len* -- ) OVR2 ADD2 SWP2 &l STH2k #00 STH2r STA INC2 GTH2k ?&l POP2 POP2 JMP2r
-
-@print ( short* -- )
-
-	SWP ,&byte JSR
-	&byte ( byte -- ) DUP #04 SFT ,&char JSR
-	&char ( char -- ) #0f AND DUP #09 GTH #27 MUL ADD #30 ADD #18 DEO
-
-JMP2r
+@phex ( short* -- ) SWP ,&b JSR &b DUP #04 SFT ,&c JSR &c #0f AND DUP #09 GTH #27 MUL ADD #30 ADD #18 DEO JMP2r 
 
 @exit ( -- )
 


@@ 362,9 356,9 @@ JMP2r
 
 JMP2r
 
-@hand-icn
-	2020 20b8 7c7c 3838
-@blank-icn
-	0000 0000 0000 0000
+@hand-icn [
+	2020 20b8 7c7c 3838 ]
+@blank-icn [
+	0000 0000 0000 0000 ]
 
 ~src/assets.tal

@@ 35,7 35,6 @@
 	@filepath $40
 	@grid &x1 $2 &y1 $2 &x2 $2 &y2 $2 &size &width $1 &height $1 &length $2
 	@selection &from &x1 $1 &y1 $1 &to &x2 $1 &y2 $1
-	@cursor &x $2 &y $2
 	@toolbar &x1 $2 &y1 $2 &x2 $2 &y2 $2
 	@head &x $1 &y $1 &addr $2
 	@variables $24


@@ 1084,7 1083,9 @@ JMP2r
 	&skip POP2 LIT ". JMP2r
 
 @set-cell ( x y c -- )
-	ROT ROT get-addr
+	ROT ROT
+	( bounds ) OVR .grid/width LDZ #01 SUB GTH ?write-cell/skip
+	get-addr
 @write-cell ( cell addr* -- )
 	( bounds ) DUP2 .grid/length LDZ2 GTH2 ?&skip
 	&force ;data/cells ADD2 STA JMP2r