1 files changed, 18 insertions(+), 10 deletions(-)

M src/manifest.tal

@@ 63,14 63,28 @@ BRK
 	;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
+		.Mouse/x DEI2 ;menu-picking JSR2 ;menu-select JSR2
+		( 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 ;print/byte JSR2 #0a18 DEO
+			( release ) #00 .Mouse/state DEO
+			&no-touch-sub
+
 		BRK
 		&no-sub
 
-	.Mouse/state DEI ;on-menu-touch JCN2
-
 	( don't leave if menu is active )
 	;draw-cat/sel LDA #ff EQU
 	.Mouse/y DEI2 #0007 GTH2 


@@ 88,14 102,6 @@ BRK
 
 BRK
 
-@on-menu-touch ( -> )
-
-	.Mouse/x DEI2 ;menu-picking JSR2 ;menu-select JSR2
-
-	( release ) #00 .Mouse/state DEO
-
-BRK
-
 @menu-picking ( x* -- cat )
 
 	#0006 #30 SFT2 DIV2 NIP


@@ 108,6 114,8 @@ JMP2r
 	;redraw JSR2
 	;draw-cat/sel STA
 	;draw-cat JSR2
+
+	#ff ;draw-sub/sel STA
 	;draw-cat/sel LDA #ff ;draw-sub JSR2
 
 JMP2r