1 files changed, 15 insertions(+), 17 deletions(-)

M src/manifest.tal

@@ 3,7 3,7 @@
 @trap-menu ( -> )
 
 	;on-mouse-menu .Mouse/vector DEO2
-	;on-control-menu .Controller/vector DEO2
+	#0000 .Controller/vector DEO2
 
 	#40 draw-cursor
 


@@ 93,21 93,16 @@ JMP2r
 
 JMP2r
 
-@on-control-menu ( -> )
-
-	( TODO )
-
-BRK
-
 @get-cat ( cat -- cat* )
 
 	STH
 	#00 ,&id STR
 	;draw-menu/manifest LDA2
 	&cat
-		[ LIT &id 00 ] STHkr EQU ?&end
+		[ LIT &id 00 ]
+			INCk ,&id STR
+			STHkr EQU ?&end
 		skip-sub
-		,&id LDR INC ,&id STR
 		LDAk ?&cat
 	POP2
 	#0000


@@ 145,10 140,12 @@ JMP2r
 	#00 ,&id STR
 	;draw-menu/manifest LDA2
 	&cat
-		[ LIT &id 00 ] [ LIT &target $1 ] EQU ?&end
+		[ LIT &target $1 ]
+		[ LIT &id 00 ]
+			INCk ,&id STR
+			EQU ?&end
 		INC2k get-strw #0008 ADD2 STH2 ADD2r
 		skip-sub
-		,&id LDR INC ,&id STR
 		LDAk ?&cat
 	POP2
 	&end


@@ 225,10 222,11 @@ JMP2r
 	#00 ,&id STR
 	[ LIT2 &manifest =manifest ]
 	&cat
-		#0401 [ LIT &sel ff ] [ LIT &id $1 ] EQU [ JMP SWP POP ] ;draw-chr/color STA
+		#0401 [ LIT &sel ff ] [ LIT &id $1 ]
+			INCk ,&id STR
+			EQU [ JMP SWP POP ] ;draw-chr/color STA
 		INC2k draw-str POP2 .Screen/x DEI2k #0008 ADD2 ROT DEO2
 		skip-sub
-		,&id LDR INC ,&id STR
 		LDAk ?&cat
 	POP2
 


@@ 355,9 353,9 @@ JMP2r
 
 ( assets )
 
-@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