@@ -157,6 +157,18 @@ skipcomment(char *w, int *cap)

 	return 0;

 }

+int

+skipbinary(char *w, int *cap)

+{

+	if(w[0] == ']') {

+		*cap = 0;

+		return 1;

+	}

+	if(w[0] == '[') *cap = 1;

+	if(*cap) return 1;

+	return 0;

+}

+

 int

 skipstring(char *w, int *cap, Uint16 *addr)

 {

@@ -195,13 +207,15 @@ capturestring(char *w, int *cap)

 int

 pass1(FILE *f)

 {

-	int ccmnt = 0, cstrg = 0;

+	int ccmnt = 0, cstrg = 0, cbits = 0;

 	Uint16 addr = 0;

 	char w[64];

 	while(fscanf(f, "%s", w) == 1) {

 		if(skipcomment(w, &ccmnt)) continue;

 		if(skipstring(w, &cstrg, &addr)) continue;

-		if(w[0] == '@') {

+		if(skipbinary(w, &cbits))

+			addr += w[0] != '[' && w[0] != ']' ? 2 : 0;

+		else if(w[0] == '@') {

 			if(!makelabel(w + 1, addr, 0))

 				return error("Pass1 failed", w);

 		} else if(w[0] == ';') {

@@ -233,7 +247,7 @@ pass1(FILE *f)

 int

 pass2(FILE *f)

 {

-	int ccmnt = 0, cstrg = 0;

+	int ccmnt = 0, cstrg = 0, cbits = 0;

 	char w[64];

 	while(fscanf(f, "%s", w) == 1) {

 		Uint8 op = 0;

@@ -242,7 +256,8 @@ pass2(FILE *f)

 		if(skipcomment(w, &ccmnt)) continue;

 		if(capturestring(w, &cstrg)) continue;

 		/* clang-format off */

-		if(w[0] == '|') p.ptr = shex(w + 1);

+		if(skipbinary(w, &cbits)) { if(w[0] != '[' && w[0] != ']') { pushshort(shex(w), 0); } }

+		else if(w[0] == '|') p.ptr = shex(w + 1);

 		else if((op = findopcode(w)) || scmp(w, "BRK")) pushbyte(op, 0);

 		else if(w[0] == ':') fscanf(f, "%s", w);

 		else if(w[0] == ';') fscanf(f, "%s", w);

@@ -13,11 +13,6 @@ cc -std=c89 -DDEBUG -Wall -Wno-unknown-pragmas -Wpedantic -Wshadow -Wextra -Werr

 clang-format -i uxn.h

 clang-format -i uxn.c

-# Cli

-clang-format -i cli.c

-# rm -f ./bin/cli

-# cc -std=c89 -DDEBUG -Wall -Wno-unknown-pragmas -Wpedantic -Wshadow -Wextra -Werror=implicit-int -Werror=incompatible-pointer-types -Werror=int-conversion -Wvla -g -Og -fsanitize=address -fsanitize=undefined uxn.c cli.c -o bin/cli

-

 # Emulator

 clang-format -i emulator.c

 rm -f ./bin/emulator

@@ -264,12 +264,15 @@ Uint8

 spritew(Device *d, Memory *m, Uint8 b)

 {

 	d->mem[d->ptr++] = b;

-	if(d->ptr > 6) {

+	if(d->ptr > 7) {

 		Uint16 x = (d->mem[2] << 8) + d->mem[3];

 		Uint16 y = (d->mem[0] << 8) + d->mem[1];

 		Uint8 *chr = &m->dat[(d->mem[4] << 8) + d->mem[5]];

-		drawchr(pixels, x, y, chr);

-		if(d->mem[6])

+		if(!d->mem[6])

+			drawchr(pixels, x, y, chr);

+		else

+			drawicn(pixels, x, y, chr, d->mem[6], 0);

+		if(d->mem[7])

 			REQDRAW = 1;

 		d->ptr = 0;

 	}

deleted file mode 100644

@@ -1,17 +0,0 @@

-( conditional jump )

-

-|0100 @RESET

-

-#06 #05 GTH ,there ROT JMP? POP2

-

-@here ( when lesser or equal )

-	#ee

-	BRK

-

-@there ( when greater )

-	#ff

-	BRK

-

-|c000 @FRAME BRK 

-|d000 @ERROR BRK 

-|FFFA .RESET .FRAME .ERROR

@@ -2,20 +2,96 @@

 :dev/w fff9 ( const write port )

+;x 2 ;y 2 ;color 1

+

 |0100 @RESET 

-	#00 =dev/w ( set dev/write to sprite ) 

-	,string                                  ( add string pointer to stack )

-	@loop

-		DUP2 LDR IOW                         ( write pointer value to console )

-		#0001 ADD2                           ( increment string pointer )

-		DUP2 LDR #00 NEQ ,loop ROT JMP? POP2 ( while *ptr!=0 goto loop )

+	( print to console )

+	,string ,displaycli JSR

+	

+	( print to screen )

+	#0008 =x #0030 =y #01 =color

+	,string ,displaygui JSR 

+	#0010 =x #0038 =y #02 =color

+	,string ,displaygui JSR 

+	#0018 =x #0040 =y #03 =color

+	,string ,displaygui JSR 

+	

 BRK

-@string " Hello World "                      ( add string to memory )

+@string " Hello Merveilles "                     ( add string to memory )

+

+@displaycli

+	#00 =dev/w                                   ( set dev/write to console ) 

+	@cliloop

+		DUP2 LDR IOW                             ( write pointer value to console )

+		#0001 ADD2                               ( increment string pointer )

+		DUP2 LDR #00 NEQ ,cliloop ROT JMP? POP2  ( while *ptr!=0 goto loop )

+	RTS

+

+@displaygui

+	#02 =dev/w                                   ( set dev/write to sprite ) 

+	@displayguiloop

+		DUP2 LDR ,printchar JSR

+		#0001 ADD2

+		~x #0008 ADD2 =x

+		DUP2 LDR #00 NEQ ,displayguiloop ROT JMP? POP2

+	RTS

+

+@printchar

+	~color #01 ROT ,getchar JSR ~x ~y ,puticon JSR

+	RTS

+

+@getchar

+	#00 SWP #0008 MUL2 ,SPRITESHEET ADD2

+	RTS

+

+@puticon

+	IOW2 ( y short )

+	IOW2 ( x short )

+	IOW2 ( sprite address )

+	IOW2  ( redraw byte )

+	RTS

+

+|0300 @SPRITESHEET ( first 128 characters of the spectrum-zx font ) 

+

+[

+	0000 0000 0000 0000 0000 2400 7e3c 0000 0000 2400 3c42 0000 0000 6c7c 7c38 1000

+	0010 387c 7c38 1000 0038 387c 6c10 3800 0010 387c 7c10 3800 0000 0018 1800 0000

+	007e 4242 4242 7e00 0000 1824 2418 0000 0018 2442 4224 1800 001e 063a 4a48 3000

+	0038 446c 107c 1000 000c 0808 0838 3800 003e 2222 2266 6600 0000 0822 0022 0800

+	0000 1018 1c18 1000 0000 0818 3818 0800 0008 1c00 001c 0800 0028 2828 2800 2800

+	003e 4a4a 3a0a 0a00 000c 3046 620c 3000 0000 0000 0000 ffff 0010 3800 3810 0038

+	0008 1c2a 0808 0800 0008 0808 2a1c 0800 0000 0804 7e04 0800 0000 1020 7e20 1000

+	0000 4040 7e00 0000 0000 0024 6624 0000 0000 1038 7c00 0000 0000 007c 3810 0000

+	0000 0000 0000 0000 0008 0808 0800 0800 0014 1400 0000 0000 0024 7e24 247e 2400

+	0008 1e28 1c0a 3c08 0042 0408 1020 4200 0030 4832 4c44 3a00 0008 1000 0000 0000

+	0004 0808 0808 0400 0010 0808 0808 1000 0000 1408 3e08 1400 0000 0808 3e08 0800

+	0000 0000 0008 0810 0000 0000 3c00 0000 0000 0000 0000 0800 0000 0204 0810 2000

+	003c 464a 5262 3c00 0018 2808 0808 3e00 003c 4202 3c40 7e00 003c 421c 0242 3c00

+	0008 1828 487e 0800 007e 407c 0242 3c00 003c 407c 4242 3c00 007e 0204 0810 1000

+	003c 423c 4242 3c00 003c 4242 3e02 3c00 0000 0008 0000 0800 0000 0800 0008 0810

+	0000 0810 2010 0800 0000 003e 003e 0000 0000 1008 0408 1000 003c 4202 0c00 0800

+	003c 425a 5442 3c00 0018 2442 7e42 4200 007c 427c 4242 7c00 003c 4240 4042 3c00

+	0078 4442 4244 7800 007e 407c 4040 7e00 003e 4040 7c40 4000 003c 4240 4e42 3c00

+	0042 427e 4242 4200 003e 0808 0808 3e00 0002 0202 4242 3c00 0044 4870 4844 4200

+	0040 4040 4040 7e00 0042 665a 4242 4200 0042 6252 4a46 4200 003c 4242 4242 3c00

+	007c 4242 7c40 4000 003c 4242 524a 3c00 007c 4242 7c44 4200 003c 403c 0242 3c00

+	00fe 1010 1010 1000 0042 4242 4242 3c00 0042 4242 4224 1800 0042 4242 5a66 4200

+	0042 2418 1824 4200 0082 4428 1010 1000 007e 0408 1020 7e00 000c 0808 0808 0c00

+	0040 2010 0804 0200 0018 0808 0808 1800 0008 1422 0000 0000 0000 0000 0000 7e00

+	0008 0400 0000 0000 0000 1c02 1e22 1e00 0020 203c 2222 3c00 0000 1e20 2020 1e00

+	0002 021e 2222 1e00 0000 1c22 3c20 1e00 000c 101c 1010 1000 0000 1c22 221e 021c

+	0020 202c 3222 2200 0008 0018 0808 0400 0008 0008 0808 4830 0020 2428 3028 2400

+	0010 1010 1010 0c00 0000 6854 5454 5400 0000 5864 4444 4400 0000 3844 4444 3800

+	0000 7844 4478 4040 0000 3c44 443c 0406 0000 2c30 2020 2000 0000 3840 3804 7800

+	0010 103c 1010 0c00 0000 4444 4444 3800 0000 4444 2828 1000 0000 4454 5454 2800

+	0000 4428 1028 4400 0000 4444 443c 0438 0000 7c08 1020 7c00 000c 0810 1008 0c00

+	0008 0808 0808 0800 0030 1008 0810 3000 0000 0032 4c00 0000 3c42 99a1 a199 423c

+]

-|c000 @FRAME BRK

-|d000 @ERROR BRK 

+|c000 @FRAME

+|d000 @ERROR 

 |FFFA .RESET .FRAME .ERROR

\ No newline at end of file

@@ -31,8 +31,8 @@ BRK

 |0200 @SPRITESHEET

-@cursor_icn .80c0 .e0f0 .f8e0 .1000 .0000 .0000 .0000 .0000

-@star_icn   .1054 .28c6 .2854 .1000 .0000 .0000 .0000 .0000

+@cursor_icn [ 80c0 e0f0 f8e0 1000 0000 0000 0000 0000 ]

+@star_icn   [ 1054 28c6 2854 1000 0000 0000 0000 0000 ]

 BRK