From bae2d37fc20ff4c1143de4a800a1ebb87343928b Mon Sep 17 00:00:00 2001
From: neauoire <aliceffekt@gmail.com>
Date: Mon, 6 Dec 2021 09:01:48 -0800
Subject: [PATCH] (uxnasm) Only catch hex labels with slen of 2 or 4

---
 projects/examples/gui/picture.tal |  30 +++++++++++++++++++++++++++++-
 projects/pictures/dafu10x10.bit   | Bin 0 -> 2048 bytes
 projects/pictures/dafu80x80.bit   | Bin 2048 -> 0 bytes
 src/uxnasm.c                      |   2 +-
 4 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100644 projects/pictures/dafu10x10.bit
 delete mode 100644 projects/pictures/dafu80x80.bit

diff --git a/projects/examples/gui/picture.tal b/projects/examples/gui/picture.tal
index 1424a25..0ce89df 100644
--- a/projects/examples/gui/picture.tal
+++ b/projects/examples/gui/picture.tal
@@ -53,7 +53,7 @@
 
 BRK
 
-@draw-icn ( x* y* width* height* addr* color  -- )
+@draw-icn ( x* y* width* height* addr* color -- )
 	
 	( load ) STH .Screen/addr DEO2 .size/height STZ2 .size/width STZ2 .position/y STZ2 .position/x STZ2
 	.size/height LDZ2 #0000 
@@ -72,6 +72,34 @@ BRK
 
 RTN
 
+@draw-icn-pixels ( x* y* width* height* addr* color -- )
+
+	( load ) STH .Screen/addr DEO2 .size/height STZ2 .size/width STZ2 .position/y STZ2 .position/x STZ2
+	.size/height LDZ2 #0000
+	&ver
+		( save ) DUP2 .position/y LDZ2 ++ .Screen/y DEO2
+		.size/width LDZ2 #0000
+		&hor
+			( get x,y ) STH2 OVR2 STH2r SWP2 OVR2 SWP2 
+			( save ) OVR2 .position/x LDZ2 ++ .Screen/x DEO2
+			( draw ) ,get-icn-pixel JSR STHkr * .Screen/pixel DEO
+			INC2 GTH2k ,&hor JCN
+		POP2 POP2
+		INC2 GTH2k ,&ver JCN
+	POP2 POP2
+	POPr
+
+RTN
+
+@get-icn-pixel ( x* y* -- color )
+
+	( get row ) OVR2 SWP2 DUP2 8MOD2
+	( get tile ) SWP2 8// 80** ++ SWP2 STEP8 ++ ;source ++ LDA
+	( get mask ) ROT ROT NIP 8MOD 
+	( get pixel ) #07 SWP - SFT #01 AND
+
+RTN
+
 @draw-chr ( x* y* width* height* addr* color -- )
 	
 	( load ) STH .Screen/addr DEO2 .size/height STZ2 .size/width STZ2 .position/y STZ2 .position/x STZ2
diff --git a/projects/pictures/dafu10x10.bit b/projects/pictures/dafu10x10.bit
new file mode 100644
index 0000000000000000000000000000000000000000..e88d7a16843e3d0e65766c25ca9a4c4cd4ca722a
GIT binary patch
literal 2048
zcmb_dUuYaf7@yg_%N}WyZH`1G)$X-LiK4wi!Rm{<Vnjv66RA{<$-PvtRn(UfZIfAT
zz(XGz`{G;g5NrR45PY%Nhg}e?*oTWE=0Wr}^r0zLZs8JcuRA-R-|X(i_91W)f4e*1
zH@}(rzHh$W{f3a9K;<l|GeA)U1j;Ct#N%;aPVr>(e}QV6p&2FsZ`A>U%c#LhF^r)|
z=LqL<5larnRSW~jA_w+M9FOY<lVbC+P*pd~*{Ru1t6pVbve^83(+R^))QRG~uag@n
z0z~irDJdF=>)Hm!QaVC#h@MQkfA3G^w{NDyTT%&va~|*@=ym_-TGusA?XHidh}JOq
zH%>YXRzG1e<p^;z;Bx!SG?^1~vI$a+EhUQY`<_Iv{#6=(Vgy(7nSG|w#N7Xj)hkk8
zNpe#oF8vIkq#5cYvS$F^a!@|E0_<&+;G7jg_@2BL7JK#IorhV_^})fsxVcuBR!w|v
zMc{d^XSo(*Q^jN3b^X?{MCVbs*7>!B`^UT7wcD#49UajJv?0RK7-o4{+WZdS0E!C{
z2;y2xIse8vqJPPX=AtsX<Ul)j_~L?q>%%p4@>Ri`mcBgqw`FTi$w+-O$SAa5!3EPt
zA6+O-&)=0h_3rtd`TVvE1nALIgw%FCJT_MupF2~-Nw!T2sy6V*h*B1C?2Xf9Lgqar
z5pKpVROTxcsc!~qI(h7AJ2yVIHIpC8(|d*=xIa(G9e*6yb>5mA|LNm_gE%WkYI}ap
zZj<xv!$Zlk${|YdqGYmQ7c46w|5MvX`m?I4l2XmKY+`R{<Lh+fh5kg@HB1zRWcpIt
zPUYsrPO4|LTz=2QpO0C@E&F~Dzth`|lpa#Z2qRVvX>a{M@6&bT&i(t2)b76O%gRWI
z^?ug%xm;@>?`F65itHmYiBPu^njL=etZv>n@mi;K?Q%Vgk~({QmN^bMvfj_To*z&I
zrnta<gzZ20Y?@E}mAiOwuSav3c2(1ky!w0Nl5>fn>lgwHQK!{vm*0~msng0@AI2qh
z@j*3^@$I$jK}j&i<io0sYJ8*jmW-eY(3U@fNXk6JU3fkgdP9DslrFo3oLeZpyhS&5
z%*>!YG;<rSHS3M4$;_5i9LHQA6g<HH)9v;hM5EEDSMh4#)eb|v!>~IJOYJBL0ezfa
z@sMA$F@ooxdi{%cUV8Qk5H_V#$T|kY7USh2!oz}rJO#Lrdy_l@yFu{52@Q`KlSzV^
z)sxL;vn|o6Hyd@RH_<hoGNC-u#Hwo(;2yfe-OC1%?aL|hZ9a4F?n9q{GxVvn16d;L
bCmK|>Zsa_|I1n+9jqfdgf8rzENc-X+*nefM

literal 0
HcmV?d00001

diff --git a/projects/pictures/dafu80x80.bit b/projects/pictures/dafu80x80.bit
deleted file mode 100644
index 6a17a89242ed8041cc3407f75de3c88db327201e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2048
zcmb_dUuYaf82@HxdwV1YduVC;P_n1^5E0EiC{_@5A1d`l0%HGIk-NV6QqzaZ390TR
zt%km+Xe-#4ON?49;)#fg5qEvj3WZ)34HetlYJ-|^=_YNs&E4*d-|X(i_91W)f4e*1
zH@}(rzHh$W{YHqMz~wCNGeA)X1WF~9!k}?qPBCQje}M;q7kDlJ%@qN(ov6V;U5yb*
z=LqW?5=#o+4h#dtFa>sh9FM7M(`56p@X+_%@u~4lu2^Q^ve^83lTp=-l2PKluag@n
z1W51xxu|=HZNUb{Qd&V!P`*mKcbrS)<8P(IH&Y3OQmRo+>vjL=+V_JX?5>X`QTj0X
zTMt_d`j4=fvIyCtQMrBQy3C3>*=VW8h7v{Bbwi?8{~?b*F@dY;#Cg}tWA6V&|ASH=
zNODsWCVvi~7I@(_vIhX(v`~IJ0PGEvVC^S_=!U#ThI{qjorhWQ{pIB*+0s{(R$Y8<
zg=QG0;g}9%Q}yH5eE-(5M5l_{m$|Qo`^UT5wcD$lpI`7-f+fMw7-o4;+I$S)EQ&n}
z5Meq)Eq&`g;Xlpl?r=0eWI?udYWE0%ZHpyz@>Ii^l)en}-a%(9>PUSv=tO)q!UdBj
zz8k4cj{ey?^xEDl&F1wz0{DqTLX@ulFgI429Xn9MNwzH-VX*T3LR2Mi{OyBPAw~@(
z5oX73R7NWmsc!~hI(hC3yEQv^qtje!^4}MK{-r6z-*=zAyw@3<edvXiGdQayN*5n!
zUzhXkQ%lLR%4sg};$pgCHykG+|5LjrR@-41idxBbY+-L`<H>a7<JCmDyeOhbbk<VZ
zPUYsr74CO}R`cS_UEeywtm?WJzth`|)P9V_0uxRNX=D9AU-NzMuXE>5mj2kG%gQK(
z^Ge&)sa$Ix>t?s~zU(79i3o29-d_A@zwcg}c{h{WzO$$*Nu515&MXToS?@<pL)SP0
zQ`}$=!?j0rHc4mhZ0$aC!Qd@Sdl&>K-@B)<%i6`zbqs=qD3i-&tFOwEl*zT7m*SE-
z{8OmO_%1m1vLqN|@?qsdIlj?*PDYRi$jTpqBxRoAE({$Dy(d3X&Ie5)_Knm&xaoUW
zCnnGynz;?z^Tk5hWo}L?mgTMw5~|_<X?FV-qEILl%Xk&=%Bm{fs@ffgp{$aGfIbcm
z7|8e87{MoBzVpoMAAa^V5S#NUWG#<ji}6yT;9<c)o&uD}y-6N{T}^xWXn@Cz%Ot_v
z^5J|wpOq*S^MxW5^XM8+8C4!>q~Ej!Py^lJ?q!2$ueBoiHb4LMx6{u)vGlyO18pJe
bCmIZcZsb(KI1n+9jcyD+dh|u#OZ(&>5$uw_

diff --git a/src/uxnasm.c b/src/uxnasm.c
index d63ec32..c1905d9 100644
--- a/src/uxnasm.c
+++ b/src/uxnasm.c
@@ -156,7 +156,7 @@ makelabel(char *name)
 	Label *l;
 	if(findlabel(name))
 		return error("Label duplicate", name);
-	if(sihx(name) && slen(name) % 2 == 0)
+	if(sihx(name) && (slen(name) == 2 || slen(name) == 4))
 		return error("Label name is hex number", name);
 	if(findopcode(name) || scmp(name, "BRK", 4) || !slen(name))
 		return error("Label name is invalid", name);