2 files changed, 21 insertions(+), 8 deletions(-)

M src/manifest.tal
A untitled.chr

@@ 195,24 195,39 @@ JMP2r
 		#20 ;draw-chr JSR2
 		INC GTHk ,&loop JCN
 	POP2
-	( #06 ;draw-sub/mask LDA AND ;draw-chr/color STA )
-	SWP2 ;draw-modkey JSR2
+	SWP2 SWP ;draw-mod JSR2
+	;draw-key JSR2
 
 JMP2r
 
-@draw-modkey ( mod key -- )
+@draw-mod (  mod -- )
 
-	SWP
 	( mod )
 	STH
 	#0800
 	&loop
 		STHkr OVR SFT #01 AND #00 EQU ,&no-button JCN
-			#00 OVR ;&buttons ADD2 LDA ;draw-chr JSR2
+			#00 OVR #30 SFT2 ;buttons-icns ADD2 ;draw-chr/raw JSR2
 			&no-button
 		INC GTHk ,&loop JCN
 	POP2
 	POPr
+
+JMP2r
+
+@buttons-icns
+	387c fefe fe7c 3800
+	3844 8282 8244 3800
+	7cfe fefe fefe 7c00
+	7c82 8282 8282 7c00
+
+	1038 7cfe 1010 1000
+	1010 10fe 7c38 1000
+	1030 70fe 7030 1000
+	1018 1cfe 1c18 1000
+
+@draw-key ( mod key -- )
+
 	( key )
 	DUP #00 EQU ,&skip-key JCN
 	DUP #08 NEQ ,&no-del JCN ;&del ,&inv JMP &no-del


@@ 225,8 240,6 @@ JMP2r
 
 JMP2r
 	&inv ROT POP ;draw-str JSR2 POP2 JMP2r
-	&buttons
-		"ABsSUDLR $1
 	&del "del $1
 	&tab "tab $1
 	&spc "spc $1


@@ 312,7 325,7 @@ JMP2r
 
 @draw-chr ( char -- )
 
-	#20 SUB #00 SWP #30 SFT2 ;font ADD2 .Screen/addr DEO2
+	#20 SUB #00 SWP #30 SFT2 ;font ADD2 &raw .Screen/addr DEO2
 	[ LIT &color 01 ] .Screen/sprite DEO
 
 JMP2r