@@ 37,8 37,6 @@
00 08 :option-erase "Erase $1
00 20 :option-zoom "Zoom $1
$1
- &x $1
- &y $1
@trap-menu ( -> )
@@ 58,11 56,9 @@ BRK
( 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 )
;hand-icn .Screen/addr DEO2
#4f .Mouse/state DEI #00 NEQ ADD .Screen/sprite DEO
-
( when touch cat )
.Mouse/state DEI #00 EQU ,&no-touch-cat JCN
.Mouse/y DEI2 #0008 GTH2 ,&no-touch-cat JCN
@@ 70,21 66,17 @@ BRK
( release ) #00 .Mouse/state DEO
BRK
&no-touch-cat
-
( when sub active )
;draw-cat/sel LDA #ff EQU ,&no-sub JCN
.Mouse/y DEI2 #03 SFT2 NIP #01 SUB ;draw-sub/sel STA
;draw-cat/sel LDA #ff ;draw-sub JSR2
-
( when touch sub )
.Mouse/state DEI #00 EQU ,&no-touch-sub JCN
;draw-sub/sel LDA ;menu-select-sub JSR2
( release ) #00 .Mouse/state DEO
&no-touch-sub
-
BRK
&no-sub
-
( don't leave if menu is active )
;draw-cat/sel LDA #ff EQU
.Mouse/y DEI2 #0007 GTH2
@@ 133,9 125,9 @@ JMP2r
;get-sub JSR2
DUP2 #0000 EQU2 ,&skip JCN
- JSR2 ;menu-close JSR2 JMP2r
+ ;menu-close JSR2
+ JSR2 JMP2r
&skip
- #1234 ;print JSR2 #0a18 DEO
POP2
;menu-close JSR2
@@ 194,7 186,6 @@ JMP2r
,&mask STR POP
;draw-cat/sel LDA ;get-cat JSR2
DUP2 #0000 EQU2 ,&skip JCN
-
;draw-cat/sel LDA ;get-anchor JSR2 ,&anchor STR2
#01 .Screen/auto DEO
LDAk STH INC2 ;skip-str JSR2
@@ 240,6 231,7 @@ JMP2r
SWP2 #0004 ADD2 ;skip-str JSR2 SWP2
INC GTHk ,&subcat JCN
POP2 POP2
+ ( TODO: merge tails )
POPr
#0000
JMP2r