4 files changed, 20 insertions(+), 10 deletions(-)

M etc/ss10x10.chr
M src/apps.tal
M src/assets.tal
M src/potato.tal

@@ 331,6 331,7 @@ JMP2r
 	DUP #09 NEQ ,&no-swatch JCN
 		OVR #01 SFT .cursor/color STZ
 		#ffff ;paint-patt/last STA2
+		;get-active-win JSR2 ;draw-win JSR2
 		,&release JMP
 		&no-swatch
 	DUP2 #000b NEQ2 ,&no-l JCN


@@ 388,7 389,7 @@ JMP2
 
 &goto-pattern ( -- )
 
-	;paint-patt/addr LDA2 ;&sel-tile JSR2
+	;patt-chr ;&sel-tile JSR2
 
 JMP2r
 

@@ 146,9 146,13 @@ c060 3018 0c06 0300 3c0c 0c0c 0c0c 3c00
 	&line
 	7f80 8080 8080 7f00
 	fc02 0202 0202 fc00
+	7f80 8387 8380 7f00
+	fc02 82c2 8202 fc00
 	&fill
 	7fff ffff ffff 7f00
 	fcfe fefe fefe fc00
+	7fff fcf8 fcff 7f00
+	fcfe 7e3e 7efe fc00
 @octave-icns
 	&a
 	007c 7c7c 7c7c 7c7c

@@ 865,21 865,26 @@ JMP2
 
 @draw-swatches ( -- )
 
+	.cursor/color LDZ STH
 	#05 .Screen/auto DEO
-	;swatch-icns/fill .Screen/addr DEO2
-	#0c .Screen/sprite DEOk DEO
-	;swatch-icns/fill .Screen/addr DEO2
-	#0d .Screen/sprite DEOk DEO
-	;swatch-icns/fill .Screen/addr DEO2
-	#0e .Screen/sprite DEOk DEO
-	;swatch-icns/line .Screen/addr DEO2
-	#0e .Screen/sprite DEOk DEO
-
+	#0c ;swatch-icns/fill #00 STHkr EQU ,draw-swatch JSR
+	#0d ;swatch-icns/fill #01 STHkr EQU ,draw-swatch JSR
+	#0e ;swatch-icns/fill #02 STHkr EQU ,draw-swatch JSR
+	#0e ;swatch-icns/line #03 STHkr EQU ,draw-swatch JSR
+	POPr
 	.Screen/x DEI2k #0040 SUB2 ROT DEO2
 	.Screen/y DEI2k #0010 ADD2 ROT DEO2
 
 JMP2r
 
+@draw-swatch ( color sprite* selected -- )
+
+	#00 SWP #40 SFT ADD2
+	.Screen/addr DEO2
+	.Screen/sprite DEOk DEO
+
+JMP2r
+
 @draw-waveform ( addr* length* zoom* -- )
 
 	.Screen/x DEI2 ,&x STR2