@@ -29,21 +29,19 @@ Read more in the [Uxambly Guide](https://wiki.xxiivv.com/site/uxambly.html).

 ```

 ( hello world )

-&Console { pad 8 char 1 byte 1 short 2 }

-

-|0100 @RESET 

+@RESET 

 	,text1 ,print-label JSR2

 	,text2 ,print-label JSR2

-	#ab =CNSL.byte

-	#cdef =CNSL.short

+	#ab =Console.byte

+	#cdef =Console.short

 BRK

 @print-label ( text )

 	$loop NOP

-		( send ) DUP2 LDR =CNSL.char

+		( send ) DUP2 LDR =Console.char

 		( incr ) #0001 ADD2

 		( loop ) DUP2 LDR #00 NEQ ^$loop MUL JMPS 

 	POP2

@@ -56,7 +54,7 @@ RTS

 |c000 @FRAME

 |d000 @ERROR 

-|FF00 ;CNSL Console

+|FF00 ;Console { pad 8 char 1 byte 1 short 2 }

 |FFF0 .RESET .FRAME .ERROR ( vectors )

 |FFF8 [ 13fd 1ef3 1bf2 ] ( palette )

@@ -16,22 +16,24 @@ typedef signed char Sint8;

 typedef unsigned short Uint16;

 typedef signed short Sint16;

-typedef struct {

-	char name[64], params[16][64];

-	Uint8 len, length[16], size, refs;

-} Template;

+typedef struct

+{

+	char name[64];

+	unsigned int size;

+} Map;

 typedef struct {

 	char name[64];

 	Uint8 len, offset, refs;

 	Uint16 addr;

-	Template *template;

+	/* map */

+	Map map[16];

+	Uint8 maps;

 } Label;

 typedef struct {

 	Uint8 data[256 * 256], tlen, llen;

 	Uint16 ptr;

-	Template templates[256];

 	Label labels[256];

 } Program;

@@ -83,16 +85,6 @@ pushtext(char *s, int lit)

 	while((c = s[i++])) pushbyte(c, 0);

 }

-Template *

-findtemplate(char *s)

-{

-	int i;

-	for(i = 0; i < p.tlen; ++i)

-		if(scmp(p.templates[i].name, s, 64))

-			return &p.templates[i];

-	return NULL;

-}

-

 Label *

 findlabel(char *s)

 {

@@ -114,12 +106,12 @@ findlabeladdr(char *s)

 	if(scin(s, '.') < 1)

 		return l->addr;

 	param = s + scin(s, '.') + 1;

-	for(i = 0; i < l->template->len; ++i) {

-		if(scmp(l->template->params[i], param, 64))

+	for(i = 0; i < l->maps; ++i) {

+		if(scmp(l->map[i].name, param, 64))

 			return l->addr + o;

-		o += l->template->length[i];

+		o += l->map[i].size;

 	}

-	printf("!!! Warning %s.%s[%s]\n", l->name, param, l->template->name);

+	printf("!!! Warning %s.%s\n", l->name, param);

 	return 0;

 }

@@ -132,10 +124,10 @@ findlabellen(char *s)

 	if(scin(s, '.') < 1)

 		return l->len;

 	param = s + scin(s, '.') + 1;

-	for(i = 0; i < l->template->len; ++i)

-		if(scmp(l->template->params[i], param, 64))

-			return l->template->length[i];

-	printf("!!! Warning %s.%s[%s]\n", l->name, param, l->template->name);

+	for(i = 0; i < l->maps; ++i)

+		if(scmp(l->map[i].name, param, 64))

+			return l->map[i].size;

+	printf("!!! Warning %s.%s\n", l->name, param);

 	return 0;

 }

@@ -178,37 +170,7 @@ error(char *name, char *id)

 }

 int

-maketemplate(char *name, FILE *f)

-{

-	Uint8 mode = 0;

-	Template *m;

-	char wv[64];

-	if(findtemplate(name))

-		return error("Template duplicate", name);

-	if(sihx(name) && slen(name) % 2 == 0)

-		return error("Template name is hex number", name);

-	if(findopcode(name))

-		return error("Template name is invalid", name);

-	m = &p.templates[p.tlen++];

-	scpy(name, m->name, 64);

-	while(fscanf(f, "%s", wv)) {

-		if(wv[0] == '{') continue;

-		if(wv[0] == '}') break;

-		if(mode == 0)

-			scpy(wv, m->params[m->len], 64);

-		else {

-			m->length[m->len] = shex(wv);

-			m->size += m->length[m->len];

-			m->len++;

-		}

-		mode = !mode;

-	}

-	printf("New template: %s[%d:%d]\n", name, m->len, m->size);

-	return 1;

-}

-

-int

-makelabel(char *name, Uint16 addr, Uint8 len, Template *m)

+makelabel(char *name, Uint16 addr)

 {

 	Label *l;

 	if(findlabel(name))

@@ -219,33 +181,29 @@ makelabel(char *name, Uint16 addr, Uint8 len, Template *m)

 		return error("Label name is invalid", name);

 	l = &p.labels[p.llen++];

 	l->addr = addr;

-	l->len = len;

 	l->refs = 0;

 	scpy(name, l->name, 64);

-	if(m)

-		l->template = m;

 	printf("New label: %s, at 0x%04x[%d]\n", l->name, l->addr, l->len);

 	return 1;

 }

 int

-makevariable(char *id, Uint16 *addr, FILE *f)

+makevariable(char *name, Uint16 *addr, FILE *f)

 {

-	char wv[64];

-	Uint16 origin;

-	Uint8 len;

-	Template *m = NULL;

-	fscanf(f, "%s", wv);

-	origin = *addr;

-	if(sihx(wv))

-		len = shex(wv);

-	else if((m = findtemplate(wv))) {

-		len = m->size;

-		m->refs++;

-	} else

-		return error("Invalid template", wv);

-	*addr += len;

-	return makelabel(id, origin, len, m);

+	Label *l;

+	char word[64];

+	if(!makelabel(name, *addr))

+		return error("Could not create variable", name);

+	l = findlabel(name);

+	while(fscanf(f, "%s", word)) {

+		if(word[0] == '{') continue;

+		if(word[0] == '}') break;

+		scpy(word, l->map[l->maps].name, 64);

+		fscanf(f, "%u", &l->map[l->maps].size);

+		*addr += l->map[l->maps].size;

+		l->maps++;

+	}

+	return 1;

 }

 int

@@ -277,18 +235,15 @@ pass1(FILE *f)

 			else

 				addr += slen(w);

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

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

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

 				return error("Pass1 failed", w);

 			scpy(w + 1, scope, 64);

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

-			if(!makelabel(sublabel(subw, scope, w + 1), addr, 0, NULL))

+			if(!makelabel(sublabel(subw, scope, w + 1), addr))

 				return error("Pass1 failed", w);

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

 			if(!makevariable(w + 1, &addr, f))

 				return error("Pass1 failed", w);

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

-			if(!maketemplate(w + 1, f))

-				return error("Pass1 failed", w);

 		} else if(findopcode(w) || scmp(w, "BRK", 4))

 			addr += 1;

 		else {

@@ -323,7 +278,7 @@ pass2(FILE *f)

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

 		Uint8 op = 0;

 		Label *l;

-		if(w[0] == '&') continue;

+		if(w[0] == ';') continue;

 		if(w[0] == '$') continue;

 		if(skipblock(w, &ccmnt, '(', ')')) continue;

 		if(skipblock(w, &ctemplate, '{', '}')) continue;

@@ -349,11 +304,10 @@ pass2(FILE *f)

 		}

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

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

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

 		else if(w[0] == '.' && (l = findlabel(w + 1))) { pushshort(findlabeladdr(w + 1), 0); l->refs++; }

 		else if(w[0] == ',' && (l = findlabel(w + 1))) { pushshort(findlabeladdr(w + 1), 1); l->refs++; }

-		else if(w[0] == '=' && (l = findlabel(w + 1)) && l->len){ pushshort(findlabeladdr(w + 1), 1); pushbyte(findopcode(findlabellen(w + 1) == 2 ? "STR2" : "STR"), 0); l->refs++;}

-		else if(w[0] == '~' && (l = findlabel(w + 1)) && l->len){ pushshort(findlabeladdr(w + 1), 1); pushbyte(findopcode(findlabellen(w + 1) == 2 ? "LDR2" : "LDR"), 0); l->refs++;}

+		else if(w[0] == '=' && (l = findlabel(w + 1))) { pushshort(findlabeladdr(w + 1), 1); pushbyte(findopcode(findlabellen(w + 1) == 2 ? "STR2" : "STR"), 0); l->refs++;}

+		else if(w[0] == '~' && (l = findlabel(w + 1))) { pushshort(findlabeladdr(w + 1), 1); pushbyte(findopcode(findlabellen(w + 1) == 2 ? "LDR2" : "LDR"), 0); l->refs++;}

 		else if(w[0] == '#' && sihx(w + 1) && slen(w + 1) == 2) pushbyte(shex(w + 1), 1); 

 		else if(w[0] == '#' && sihx(w + 1) && slen(w + 1) == 4) pushshort(shex(w + 1), 1);

 		else if(w[0] == '+' && sihx(w + 1) && slen(w + 1) == 2) pushbyte((Sint8)shex(w + 1), 1);

@@ -367,15 +321,13 @@ pass2(FILE *f)

 }

 void

-cleanup(void)

+cleanup(char *filename)

 {

 	int i;

+	printf("Assembled %s.\n\n", filename);

 	for(i = 0; i < p.llen; ++i)

 		if(!p.labels[i].refs)

 			printf("--- Unused label: %s\n", p.labels[i].name);

-	for(i = 0; i < p.tlen; ++i)

-		if(!p.templates[i].refs)

-			printf("--- Unused template: %s\n", p.templates[i].name);

 }

 int

@@ -390,7 +342,6 @@ main(int argc, char *argv[])

 		return error("Assembly", "Failed");

 	fwrite(p.data, sizeof(p.data), 1, fopen(argv[2], "wb"));

 	fclose(f);

-	printf("Assembled %s.\n\n", argv[2]);

-	cleanup();

+	cleanup(argv[2]);

 	return 0;

 }

@@ -20,5 +20,5 @@ cc -std=c89 -DDEBUG -Wall -Wno-unknown-pragmas -Wpedantic -Wshadow -Wextra -Werr

 # cc uxn.c emulator.c -std=c89 -Os -DNDEBUG -g0 -s -Wall -Wno-unknown-pragmas -L/usr/local/lib -lSDL2 -o bin/emulator

 # run

-./bin/assembler projects/examples/dev.ctrl.usm bin/boot.rom

+./bin/assembler projects/examples/dev.mouse.usm bin/boot.rom

 ./bin/emulator bin/boot.rom

@@ -1,20 +1,18 @@

 ( hello world )

-&Console { pad 8 char 1 byte 1 short 2 }

-

-|0100 @RESET 

+@RESET 

 	,text1 ,print-label JSR2

 	,text2 ,print-label JSR2

-	#ab =CNSL.byte

-	#cdef =CNSL.short

+	#ab =Console.byte

+	#cdef =Console.short

 BRK

 @print-label ( text )

 	$loop NOP

-		( send ) DUP2 LDR =CNSL.char

+		( send ) DUP2 LDR =Console.char

 		( incr ) #0001 ADD2

 		( loop ) DUP2 LDR #00 NEQ ^$loop MUL JMPS 

 	POP2

@@ -27,7 +25,7 @@ RTS

 |c000 @FRAME

 |d000 @ERROR 

-|FF00 ;CNSL Console

+|FF00 ;Console { pad 8 char 1 byte 1 short 2 }

 |FFF0 .RESET .FRAME .ERROR ( vectors )

 |FFF8 [ 13fd 1ef3 1bf2 ] ( palette )

\ No newline at end of file

new file mode 100644

@@ -0,0 +1,75 @@

+( Controller )

+

+;slime { color 1 }

+

+|0100 @RESET 

+	

+	( set origin )

+	~Screen.width #0002 DIV2 =Sprite.x 

+	~Screen.height #0002 DIV2 =Sprite.y

+	,default_icn =Sprite.addr

+	#11 =Sprite.color

+	#0a =slime

+

+BRK

+

+|c000 @FRAME 

+	

+	#0a =slime

+	( hold ctrl key to change slime color )

+	,no-ctrl ~Controller.buttons #0f AND #01 NEQ JMP2? POP2

+		#05 =slime

+	@no-ctrl

+	( hold alt key to change slime color )

+	,no-alt ~Controller.buttons #0f AND #02 NEQ JMP2? POP2

+		#0f =slime

+	@no-alt

+	( detect movement )

+	,no-up ~Controller.buttons #f0 AND #10 NEQ JMP2? POP2

+		( clear ) #10 =Sprite.color

+		( move ) ~Sprite.y #0001 SUB2 =Sprite.y ,up_icn =Sprite.addr

+		( draw ) ,redraw JSR2 BRK

+	@no-up

+	,no-down ~Controller.buttons #f0 AND #20 NEQ JMP2? POP2

+		( clear ) #10 =Sprite.color

+		( move ) ~Sprite.y #0001 ADD2 =Sprite.y ,down_icn =Sprite.addr

+		( draw ) ,redraw JSR2 BRK

+	@no-down

+	,no-left ~Controller.buttons #f0 AND #40 NEQ JMP2? POP2

+		( clear ) #10 =Sprite.color

+		( move ) ~Sprite.x #0001 SUB2 =Sprite.x ,left_icn =Sprite.addr

+		( draw ) ,redraw JSR2 BRK

+	@no-left

+	,no-right ~Controller.buttons #f0 AND #80 NEQ JMP2? POP2

+		( clear ) #10 =Sprite.color

+		( move ) ~Sprite.x #0001 ADD2 =Sprite.x ,right_icn =Sprite.addr

+		( draw ) ,redraw JSR2 BRK

+	@no-right

+

+BRK

+

+@redraw

+	

+	( draw face )

+	#11 =Sprite.color

+	( draw slime )

+	,slime_icn =Sprite.addr

+	~slime =Sprite.color

+

+RTS

+

+@default_icn [ 3c7e ffdb ffe7 7e3c ]

+@up_icn      [ 2466 e7db ffff 7e3c ]

+@down_icn    [ 3c7e ffff dbe7 6624 ]

+@left_icn    [ 3c7e ef1f 1fef 7e3c ]

+@right_icn   [ 3c7e f7f8 f8f7 7e3c ]

+@slime_icn   [ 0000 183c 3c18 0000 ]

+

+|d000 @ERROR BRK 

+

+|FF10 ;Screen { width 2 height 2 pad 4 y 2 x 2 color 1 }

+|FF20 ;Sprite { pad 8 x 2 y 2 addr 2 color 1 }

+|FF30 ;Controller { buttons 1 }

+

+|FFF0 .RESET .FRAME .ERROR ( vectors )

+|FFF8 [ 0daf 02ff 035f ] ( palette )

deleted file mode 100644

@@ -1,79 +0,0 @@

-( dev/ctrl )

-

-&Screen     { width 2 height 2 pad 4 y 2 x 2 color 1 }

-&Sprite     { pad 8 x 2 y 2 addr 2 color 1 }

-&Controller { buttons 1 }

-

-;slime-color 1

-

-|0100 @RESET 

-

-	( set origin )

-	~dev/screen.width #0002 DIV2 =dev/sprite.x 

-	~dev/screen.height #0002 DIV2 =dev/sprite.y

-	,default_icn =dev/sprite.addr

-	#11 =dev/sprite.color

-	#0a =slime-color

-

-BRK

-

-|c000 @FRAME 

-	

-	#0a =slime-color

-	( hold ctrl key to change slime color )

-	,no-ctrl ~dev/ctrl.buttons #0f AND #01 NEQ JMP2? POP2

-		#05 =slime-color

-	@no-ctrl

-	( hold alt key to change slime color )

-	,no-alt ~dev/ctrl.buttons #0f AND #02 NEQ JMP2? POP2

-		#0f =slime-color

-	@no-alt

-	( detect movement )

-	,no-up ~dev/ctrl.buttons #f0 AND #10 NEQ JMP2? POP2

-		( clear ) #10 =dev/sprite.color

-		( move ) ~dev/sprite.y #0001 SUB2 =dev/sprite.y ,up_icn =dev/sprite.addr

-		( draw ) ,redraw JSR2 BRK

-	@no-up

-	,no-down ~dev/ctrl.buttons #f0 AND #20 NEQ JMP2? POP2

-		( clear ) #10 =dev/sprite.color

-		( move ) ~dev/sprite.y #0001 ADD2 =dev/sprite.y ,down_icn =dev/sprite.addr

-		( draw ) ,redraw JSR2 BRK

-	@no-down

-	,no-left ~dev/ctrl.buttons #f0 AND #40 NEQ JMP2? POP2

-		( clear ) #10 =dev/sprite.color

-		( move ) ~dev/sprite.x #0001 SUB2 =dev/sprite.x ,left_icn =dev/sprite.addr

-		( draw ) ,redraw JSR2 BRK

-	@no-left

-	,no-right ~dev/ctrl.buttons #f0 AND #80 NEQ JMP2? POP2

-		( clear ) #10 =dev/sprite.color

-		( move ) ~dev/sprite.x #0001 ADD2 =dev/sprite.x ,right_icn =dev/sprite.addr

-		( draw ) ,redraw JSR2 BRK

-	@no-right

-

-BRK

-

-@redraw

-	

-	( draw face )

-	#11 =dev/sprite.color

-	( draw slime )

-	,slime_icn =dev/sprite.addr

-	~slime-color =dev/sprite.color

-

-RTS

-

-@default_icn [ 3c7e ffdb ffe7 7e3c ]

-@up_icn      [ 2466 e7db ffff 7e3c ]

-@down_icn    [ 3c7e ffff dbe7 6624 ]

-@left_icn    [ 3c7e ef1f 1fef 7e3c ]

-@right_icn   [ 3c7e f7f8 f8f7 7e3c ]

-@slime_icn   [ 0000 183c 3c18 0000 ]

-

-|d000 @ERROR BRK 

-

-|FF10 ;dev/screen Screen

-|FF20 ;dev/sprite Sprite

-|FF30 ;dev/ctrl   Controller

-

-|FFF0 .RESET .FRAME .ERROR ( vectors )

-|FFF8 [ 0daf 02ff 035f ] ( palette )

@@ -1,20 +1,11 @@

-( dev/key )

+( Keys )

-&Screen { width 2 height 2 pad 4 x 2 y 2 color 1 }

-&Sprite { pad 8 x 2 y 2 addr 2 color 1 }

-&Keyboard { key 1 }

-&Mouse  { x 2 y 2 state 1 chord 1 }

-

-&Textarea2d { x1 2 y1 2 x2 2 y2 2 color 1 addr 2 cursor 1 }

-&Rect2d { x1 2 y1 2 x2 2 y2 2 }

-&Point2d { x 2 y 2 }

-

-;mouse Point2d

-;textarea Textarea2d

-;rect Rect2d

-;color 1

-;blink 1 

-;timer 1

+;mouse { x 2 y 2 }

+;textarea { x1 2 y1 2 x2 2 y2 2 color 1 addr 2 cursor 1 }

+;rect { x1 2 y1 2 x2 2 y2 2 }

+;color { byte 1 }

+;blink { byte 1 } 

+;timer { byte 1 }

 |0100 @RESET 

@@ -33,7 +24,7 @@ BRK

 @redraw-window

-	#0000 #0000 ~dev/screen.width ~dev/screen.height #01 ,pattern ,tile-rect JSR2

+	#0000 #0000 ~Screen.width ~Screen.height #01 ,pattern ,tile-rect JSR2

 	( dropshadow )

 	~textarea.x2 #0001 ADD2 ~textarea.y1 ~textarea.x2 #0004 ADD2 ~textarea.y2 #0004 ADD2 #01 ,fill-rect JSR2

 	~textarea.x1 ~textarea.y2 #0001 ADD2 ~textarea.x2 #0001 ADD2 ~textarea.y2 #0004 ADD2 #01 ,fill-rect JSR2

@@ -54,8 +45,8 @@ RTS

 	,skip ~timer #10 LTH JMP2? POP2

 		#00 =timer

 		~blink #00 EQU =blink

-		,cursor =dev/sprite.addr

-		#05 ~blink ADD =dev/sprite.color

+		,cursor =Sprite.addr

+		#05 ~blink ADD =Sprite.color

 	@skip 

 	~timer #01 ADD =timer

@@ -63,64 +54,64 @@ RTS

 @tile-rect ( x1 y1 x2 y2 color addr )

-	=dev/sprite.addr =color =rect.y2 =rect.x2 DUP2 =dev/sprite.y =rect.y1 DUP2 =dev/sprite.x =rect.x1

+	=Sprite.addr =color =rect.y2 =rect.x2 DUP2 =Sprite.y =rect.y1 DUP2 =Sprite.x =rect.x1

 	$ver

-		~rect.x1 =dev/sprite.x

+		~rect.x1 =Sprite.x

 		$hor

-			( draw ) ~color =dev/sprite.color

-			( incr ) ~dev/sprite.x #0008 ADD2 =dev/sprite.x

-			,$hor ~dev/sprite.x ~rect.x2 LTH2 JMP2? POP2

-		( incr ) ~dev/sprite.y #0008 ADD2 =dev/sprite.y

-		,$ver ~dev/sprite.y ~rect.y2 LTH2 JMP2? POP2

+			( draw ) ~color =Sprite.color

+			( incr ) ~Sprite.x #0008 ADD2 =Sprite.x

+			,$hor ~Sprite.x ~rect.x2 LTH2 JMP2? POP2

+		( incr ) ~Sprite.y #0008 ADD2 =Sprite.y

+		,$ver ~Sprite.y ~rect.y2 LTH2 JMP2? POP2

 RTS

 @fill-rect ( x1 y1 x2 y2 color )

-	( load ) =color =rect.y2 =rect.x2 DUP2 =dev/screen.y =rect.y1 DUP2 =dev/screen.x =rect.x1

+	( load ) =color =rect.y2 =rect.x2 DUP2 =Screen.y =rect.y1 DUP2 =Screen.x =rect.x1

 	$ver

-		~rect.x1 =dev/screen.x

+		~rect.x1 =Screen.x

 		$hor

-			( draw ) ~color =dev/screen.color

-			( incr ) ~dev/screen.x #0001 ADD2 =dev/screen.x

-			,$hor ~dev/screen.x ~rect.x2 LTH2 JMP2? POP2

-		( incr ) ~dev/screen.y #0001 ADD2 =dev/screen.y

-		,$ver ~dev/screen.y ~rect.y2 LTH2 JMP2? POP2

+			( draw ) ~color =Screen.color

+			( incr ) ~Screen.x #0001 ADD2 =Screen.x

+			,$hor ~Screen.x ~rect.x2 LTH2 JMP2? POP2

+		( incr ) ~Screen.y #0001 ADD2 =Screen.y

+		,$ver ~Screen.y ~rect.y2 LTH2 JMP2? POP2

 RTS

 @line-rect ( x1 y1 x2 y2 color )

-	( load ) =color =rect.y2 =rect.x2 DUP2 =dev/screen.y =rect.y1 DUP2 =dev/screen.x =rect.x1

+	( load ) =color =rect.y2 =rect.x2 DUP2 =Screen.y =rect.y1 DUP2 =Screen.x =rect.x1

 	$hor

-		( incr ) ~dev/screen.x #0001 ADD2 =dev/screen.x

-		( draw ) ~rect.y1 =dev/screen.y ~color =dev/screen.color

-		( draw ) ~rect.y2 =dev/screen.y ~color =dev/screen.color

-		,$hor ~dev/screen.x ~rect.x2 LTH2 JMP2? POP2

-	~rect.y1 =dev/screen.y

+		( incr ) ~Screen.x #0001 ADD2 =Screen.x

+		( draw ) ~rect.y1 =Screen.y ~color =Screen.color

+		( draw ) ~rect.y2 =Screen.y ~color =Screen.color

+		,$hor ~Screen.x ~rect.x2 LTH2 JMP2? POP2

+	~rect.y1 =Screen.y

 	$ver

-		( draw ) ~rect.x1 =dev/screen.x ~color =dev/screen.color

-		( draw ) ~rect.x2 =dev/screen.x ~color =dev/screen.color

-		( incr ) ~dev/screen.y #0001 ADD2 =dev/screen.y

-		,$ver ~dev/screen.y ~rect.y2 #0001 ADD2 LTH2 JMP2? POP2

+		( draw ) ~rect.x1 =Screen.x ~color =Screen.color

+		( draw ) ~rect.x2 =Screen.x ~color =Screen.color

+		( incr ) ~Screen.y #0001 ADD2 =Screen.y

+		,$ver ~Screen.y ~rect.y2 #0001 ADD2 LTH2 JMP2? POP2

 RTS

 @draw-textarea ( x y color addr )

-	( load ) =textarea.addr =textarea.color =dev/sprite.y =dev/sprite.x 

+	( load ) =textarea.addr =textarea.color =Sprite.y =Sprite.x 

 	~textarea.addr

 	$loop

-		( draw ) DUP2 LDR #00 SWP #0008 MUL2 ,font ADD2 =dev/sprite.addr ~textarea.color =dev/sprite.color

+		( draw ) DUP2 LDR #00 SWP #0008 MUL2 ,font ADD2 =Sprite.addr ~textarea.color =Sprite.color

 		( detect linebreaks )

 		DUP2 LDR #0d NEQ ,$no-return ROT JMP2? POP2

-			~textarea.x1 =dev/sprite.x 

-			( incr ) ~dev/sprite.y #0008 ADD2 =dev/sprite.y

-			( decr ) ~dev/sprite.x #0008 SUB2 =dev/sprite.x

+			~textarea.x1 =Sprite.x 

+			( incr ) ~Sprite.y #0008 ADD2 =Sprite.y

+			( decr ) ~Sprite.x #0008 SUB2 =Sprite.x

 		$no-return

 		( incr ) #0001 ADD2

-		( incr ) ~dev/sprite.x #0008 ADD2 =dev/sprite.x

+		( incr ) ~Sprite.x #0008 ADD2 =Sprite.x

 		DUP2 LDR #00 NEQ ,$loop ROT JMP2? POP2

 	POP2

@@ -129,43 +120,43 @@ RTS

 @do-textarea

 	( ,blink-cursor JSR2 )

-	,do-textarea-end ~dev/key #00 EQU JMP2? POP2 ( skip on no key )

+	,do-textarea-end ~Keys #00 EQU JMP2? POP2 ( skip on no key )

 	( backspace )

-	,any-key ~dev/key #08 NEQ JMP2? POP2

+	,any-key ~Keys #08 NEQ JMP2? POP2

 		,input-end ~textarea.cursor #00 EQU JMP2? POP2

 			( decr ) ~textarea.cursor #01 SUB =textarea.cursor

 			#00 ~textarea.addr #00 ~textarea.cursor ADD2 STR

 			,input-end JMP2

 	@any-key

-	~dev/key ~textarea.addr #00 ~textarea.cursor ADD2 STR

+	~Keys ~textarea.addr #00 ~textarea.cursor ADD2 STR

 	( incr ) ~textarea.cursor #01 ADD =textarea.cursor

 	@input-end

-	#00 =dev/key ( release key )

+	#00 =Keys ( release key )

 	,redraw JSR2

 	( add cursor )

-	,cursor =dev/sprite.addr

-	#06 =dev/sprite.color

+	,cursor =Sprite.addr

+	#06 =Sprite.color

 	@do-textarea-end

 RTS

 @do-cursor

-	,skip-drag ~dev/mouse.state #01 NEQ JMP2? POP2

+	,skip-drag ~Mouse.state #01 NEQ JMP2? POP2

 		~mouse.x =textarea.x1 ~mouse.y =textarea.y1 

 		,redraw-window JSR2

 		,redraw JSR2

 	@skip-drag 

-	~mouse.x ~dev/mouse.x NEQU2

-	~mouse.y ~dev/mouse.y NEQU2

+	~mouse.x ~Mouse.x NEQU2

+	~mouse.y ~Mouse.y NEQU2

 	#0000 EQU2 RTS? ( Return if unchanged )

 	( clear last cursor )

 	#10 ,clear_icn ~mouse.x ~mouse.y ,draw-sprite JSR2

 	( record mouse positions )

-	~dev/mouse.x =mouse.x ~dev/mouse.y =mouse.y

+	~Mouse.x =mouse.x ~Mouse.y =mouse.y

 	#12 ,cursor_icn ~mouse.x ~mouse.y ,draw-sprite JSR2

@@ -173,10 +164,10 @@ RTS

 @draw-sprite

-	=dev/sprite.y

-	=dev/sprite.x

-	=dev/sprite.addr

-	=dev/sprite.color

+	=Sprite.y

+	=Sprite.x

+	=Sprite.addr

+	=Sprite.color

 RTS

@@ -224,10 +215,10 @@ RTS

 |d000 @ERROR BRK 

-|FF10 ;dev/screen Screen

-|FF20 ;dev/sprite Sprite

-|FF40 ;dev/key    Keyboard

-|FF50 ;dev/mouse  Mouse

+|FF10 ;Screen { width 2 height 2 pad 4 x 2 y 2 color 1 }

+|FF20 ;Sprite { pad 8 x 2 y 2 addr 2 color 1 }

+|FF40 ;Keys   { key 1 }

+|FF50 ;Mouse  { x 2 y 2 state 1 chord 1 }

 |FFF0 .RESET .FRAME .ERROR ( vectors )

 |FFF8 [ f0ff f000 f00f ] ( palette )

@@ -1,53 +1,46 @@

-( dev/mouse )

+( Mouse )

-&Screen { width 2 height 2 pad 4 y 2 x 2 color 1 }

-&Sprite { pad 8 x 2 y 2 addr 2 color 1 }

-&Mouse  { x 2 y 2 state 1 chord 1 }

-

-&Label2d { x 2 y 2 color 1 addr 2 }

-&Point2d { x 2 y 2 }

-

-;label Label2d

-;cat Point2d 

-;mouse Point2d

-;color 1

-;timer 1

+;label { x 2 y 2 color 1 addr 2 }

+;cat { x 2 y 2 } 

+;pointer { x 2 y 2 }

+;color { byte 1 }

+;timer { byte 1 }

 |0100 @RESET 

 	( position cat )

-	~dev/screen.width #0002 DIV2 =cat.x 

-	~dev/screen.height #0038 SUB2 =cat.y

+	~Screen.width #0002 DIV2 =cat.x 

+	~Screen.height #0038 SUB2 =cat.y

 	#01 =color

 	( draw polycat )

 	,draw-polycat JSR2

 BRK

-|0200 @FRAME

+@FRAME

 	,draw-cursor JSR2

 	( reset timer -> move cat tail )

-	,no-click ~dev/mouse.state #00 EQU JMP2? POP2

+	,no-click ~Mouse.state #00 EQU JMP2? POP2

 		#50 =timer

 	@no-click

 	( detect click )

-	,no-click12 ~dev/mouse.state #11 NEQ JMP2? POP2

+	,no-click12 ~Mouse.state #11 NEQ JMP2? POP2

 		#0058 #0040 #01 ,mouse12_text ,draw-label JSR2

-		#10 ,cursor_icn ~mouse.x ~mouse.y ,draw-sprite JSR2

+		#10 ,cursor_icn ~pointer.x ~pointer.y ,draw-sprite JSR2

 		~color ,mouse12_icn #0048 #0040 ,draw-sprite JSR2

 		,end-click JMP2

 	@no-click12

-	,no-click1 ~dev/mouse.state #01 NEQ JMP2? POP2

+	,no-click1 ~Mouse.state #01 NEQ JMP2? POP2

 		#0058 #0040 #01 ,mouse1_text ,draw-label JSR2

-		#12 ,cursor_icn ~mouse.x ~mouse.y ,draw-sprite JSR2

+		#12 ,cursor_icn ~pointer.x ~pointer.y ,draw-sprite JSR2

 		~color ,mouse1_icn #0048 #0040 ,draw-sprite JSR2

 		,end-click JMP2

 	@no-click1

-	,no-click2 ~dev/mouse.state #10 NEQ JMP2? POP2

+	,no-click2 ~Mouse.state #10 NEQ JMP2? POP2

 		#0058 #0040 #01 ,mouse2_text ,draw-label JSR2

-		#13 ,cursor_icn ~mouse.x ~mouse.y ,draw-sprite JSR2

+		#13 ,cursor_icn ~pointer.x ~pointer.y ,draw-sprite JSR2

 		~color ,mouse2_icn #0048 #0040 ,draw-sprite JSR2

 		,end-click JMP2

 	@no-click2

@@ -64,16 +57,20 @@ BRK

 @draw-cursor

-	~mouse.x ~dev/mouse.x NEQU2

-	~mouse.y ~dev/mouse.y NEQU2

+	( clear last cursor )

+	,clear_icn =Sprite.addr 

+	~pointer.x =Sprite.x 

+	~pointer.y =Sprite.y 

+	#10 =Sprite.color

-	#0000 EQU2 RTS? ( Return if unchanged )

+	( record pointer positions )

+	~Mouse.x =pointer.x ~Mouse.y =pointer.y

-	( clear last cursor )

-	#10 ,clear_icn ~mouse.x ~mouse.y ,draw-sprite JSR2

-	( record mouse positions )

-	~dev/mouse.x =mouse.x ~dev/mouse.y =mouse.y

-	#11 ,cursor_icn ~mouse.x ~mouse.y ,draw-sprite JSR2

+	( draw new cursor )

+	,cursor_icn =Sprite.addr 

+	~pointer.x =Sprite.x 

+	~pointer.y =Sprite.y 

+	#11 =Sprite.color

 RTS

@@ -104,8 +101,8 @@ RTS

 		,polycat #00b0 ADD2 ~cat.x #0008 ADD2 ~cat.y #0010 ADD2 ,draw-sprite-chr JSR2

 	@animate-polycat-tail-next2

 	( look-at )

-	~mouse.x ~cat.x #0008 ADD2 GTH2 ,animate-polycat-right ROT JMP2? POP2

-		~mouse.y ~cat.y #0008 ADD2 GTH2 ,animate-polycat-left-down ROT JMP2? POP2

+	~pointer.x ~cat.x #0008 ADD2 GTH2 ,animate-polycat-right ROT JMP2? POP2

+		~pointer.y ~cat.y #0008 ADD2 GTH2 ,animate-polycat-left-down ROT JMP2? POP2

 			,polycat #0040 ADD2 ~cat.x ~cat.y #0008 ADD2 ,draw-sprite-chr JSR2

 			,polycat #0050 ADD2 ~cat.x #0008 ADD2 ~cat.y #0008 ADD2 ,draw-sprite-chr JSR2

 		RTS

@@ -114,7 +111,7 @@ RTS

 			,polycat #0030 ADD2 ~cat.x #0008 ADD2 ~cat.y #0008 ADD2 ,draw-sprite-chr JSR2

 		RTS

 	@animate-polycat-right

-		~mouse.y ~cat.y #0008 ADD2 GTH2 ,animate-polycat-right-down ROT JMP2? POP2

+		~pointer.y ~cat.y #0008 ADD2 GTH2 ,animate-polycat-right-down ROT JMP2? POP2

 			,polycat #0060 ADD2 ~cat.x ~cat.y #0008 ADD2 ,draw-sprite-chr JSR2

 			,polycat #0070 ADD2 ~cat.x #0008 ADD2 ~cat.y #0008 ADD2 ,draw-sprite-chr JSR2

 		RTS

@@ -127,12 +124,12 @@ RTS

 @draw-label ( x y color addr )

-	( load ) =label.addr =label.color =dev/sprite.y =dev/sprite.x 

+	( load ) =label.addr =label.color =Sprite.y =Sprite.x 

 	~label.addr

 	$loop

-		( draw ) DUP2 LDR #00 SWP #0008 MUL2 ,font ADD2 =dev/sprite.addr ~label.color =dev/sprite.color

+		( draw ) DUP2 LDR #00 SWP #0008 MUL2 ,font ADD2 =Sprite.addr ~label.color =Sprite.color

 		( incr ) #0001 ADD2

-		( incr ) ~dev/sprite.x #0008 ADD2 =dev/sprite.x

+		( incr ) ~Sprite.x #0008 ADD2 =Sprite.x

 		DUP2 #0001 ADD2  LDR #00 NEQ ,$loop ROT JMP2? POP2

 	POP2

@@ -140,19 +137,19 @@ RTS

 @draw-sprite

-	=dev/sprite.y

-	=dev/sprite.x

-	=dev/sprite.addr

-	=dev/sprite.color

+	=Sprite.y

+	=Sprite.x

+	=Sprite.addr

+	=Sprite.color

 RTS

 @draw-sprite-chr

-	=dev/sprite.y

-	=dev/sprite.x

-	=dev/sprite.addr

-	#20 =dev/sprite.color

+	=Sprite.y

+	=Sprite.x

+	=Sprite.addr

+	#20 =Sprite.color

 RTS

@@ -223,9 +220,9 @@ RTS

 |d000 @ERROR BRK 

-|FF10 ;dev/screen Screen

-|FF20 ;dev/sprite Sprite

-|FF50 ;dev/mouse  Mouse

+|FF10 ;Screen { width 2 height 2 pad 4 y 2 x 2 color 1 }

+|FF20 ;Sprite { pad 8 x 2 y 2 addr 2 color 1 }

+|FF50 ;Mouse  { x 2 y 2 state 1 chord 1 }

 |FFF0 .RESET .FRAME .ERROR ( vectors )

 |FFF8 [ 0f85 0fd5 0fb5 ] ( palette )