From beb9d2666f986724ddaf608b1d1973733d19eb0e Mon Sep 17 00:00:00 2001 From: Jeremy Rand Date: Fri, 19 Oct 2018 22:48:40 -0400 Subject: [PATCH] Fix issues related to support for cc65 2.17. It only compiles now under 2.17. --- .../UserInterfaceState.xcuserstate | Bin 34963 -> 36938 bytes a2sudoku/Makefile | 4 ++-- a2sudoku/make/V2Make.scpt | Bin 4906 -> 4906 bytes a2sudoku/make/tail.mk | 2 +- a2sudoku/ui.c | 21 +++++++++--------- 5 files changed, 13 insertions(+), 14 deletions(-) diff --git a/a2sudoku.xcodeproj/project.xcworkspace/xcuserdata/jrand.xcuserdatad/UserInterfaceState.xcuserstate b/a2sudoku.xcodeproj/project.xcworkspace/xcuserdata/jrand.xcuserdatad/UserInterfaceState.xcuserstate index 4ebc6f9a07713f3260c896bac8170c763ac58c68..c4ee5a23b7993384fba10b89339e0d5021641bd1 100644 GIT binary patch delta 17909 zcma*O2V9fa_dovJ`)m*hI|+zPK`;;xVk9w^m`qF~rW3P?ImCQo0kMK; zB~}uvh}Fb;Vl(jxv4z-5Y$Ns%pA&nD{lo#{5OJ0`N1P`v5EqH7#4X}B@eOf@ct|`V zejt7%ekcAQ{v`e){ss{6zz*00SKtQREx-eK17F|=6d)W#040b78W0PTKu^#M^ag!E zU(gR|K^DjcxgZY|fihqK<)8-Cf;vzS8o)>}7FfZ1U?KPbECDTG1y~K%fDK?H_!w*k z+rW14DcBA6f_>mH_!1lk=fM^5HMkA#gNNV=u>1=CfB>?PgB_p?bc1r}0|Q|w41?iN z4P#+4><)Xu0dN@1h6Qi}d>2lEGvG`(7h2(aa3TBvE`cp@1zZi+zzuLC{1|SA+u(Ni zDclYB!hP@{JOq!zWAGF_4R6D5;2n4uehcrx`|vyX06ww6r|@U^3_gdyz+Xv{q)3`% zNS3rGUBD&Mm2@M$$&RECsU#yw6&XdU$!Ic$)R3`c3Yki#k?CZ2QcGr$+2n9Chs-7O z$b3>ymXQW>Bsq#4O^zYQlH*7VDUk1yQ^=|02jmiRDY=YXPPULM$X3#_lH5pcB0nTQ zB0nZKlLyFyPIafWR2G#@ z4X1LbTnm*)KAa#g3Onpfmq0UfesdLnM>Raj_b)Wi7wJpdD!^T0%S1F0`EXqP=NLI2}PN=}1~dN6~6JnvS70bT>MMPNjR&z3AR_K3zZ; z(nWMJT|(>VQd$qr&<47kuAq%{CEZ9j(arP-TA-)W)9C5+40m3O16BW@A_lo4|Hs zQ`l6tC)n&cwwWElj$|jYQ`p(;LUs|mj9ta9V>hvz zE$k=kc6JB5ll_d{!yaXivB%jH>`C@2dyV~y{hGbb-eJFEpRzx*&)DbeFYK=z;2=kG zJZHx_a&DYEC+7mWAg(i~|s5m&@d|Tq&pL$~Xg8&Q)+Dxl!C` zZVWe;8^>9=iQFX4GM$^j&F2$mh2_hksIKwvWhXAwAuzy$;@3jSN(VWfZ$5VS(GutD&* zCUALHz$IGOvDqo-37)Vc?1|n)Um~=H=p%Tv5d8$1;D4SNh?@rygNY%;(5wMN!%K?m z^||1d|kRbGaTYOV_o2-HgC0SNqmwr}X zHPx}9xS}e&y7Ema&$9IjE|d(#z4}`Fde}L?eg*Sv54%_ex4|l1JBs&+4~Wo}#6n^b zv6y&Y2ot&r3L$(Yv4mJkEF+c+5ki!p7NW7Vor9-Yh&7_L*9uC(@0{(OZy@w5iH*c2 z@e(2hmF@DABuT;oQaTg1e-iI@UfYRXgv$zI2eDI#5i~1^Pl??^tPm%}XO@|(O6v>S z-%mfi$V#$X?zUoQAL`!tJ^PRPR2Jh(y>X*yR#1*EvW1rc-r zPBw_Z5knk`Ap&O%aoE2hW{!1+zr4fv1b{#g1Ud^jLavY}R&tpL@)B-9HHSPUSlD~p{CXar5x+$dkR6*Pkp z*xBSpC0W2IFq#NmzFd3_Hs=b)fp>|}b-)4yfWUb04wwKYf=OVqFhUq5j1k5Of-qi~ zAWRb8T?eLssbCtI4rYLvU>2AS<_J@TIl?^QJ>dgknXp1wC9Hk>{VuS*-;sq9)d*SyiX+}1kQdgiUxRkl`(waD(xzUytR$SSqd41eX2z(=;$ zcV4m8E2_+f_=t$;*z{DDQXQknP)0>7)Uh$KiZpdvcZDV+Jz5>zBQ-TWrpFsz4{Wv3 znP^@67SCO_*2z{UKHBxo-k;mrr&xco(|ESY_6u-8RMGvyv=(qsn2z5KURiv>5%KjO z6=n#27x9{604InFa1xv%27@zT0XSzpYwzkiyuwtfA2F!7pS~)o6_Br5-&6*crW?>vLg#JDC?Encsv3|3zjw zCgW$D-Pl)jAcPdA14&_F3#5fbZ8Eb!9@Bw#!s7p;vkE%5!LbPMza=DL)=PBI9eTc^ zDixNzL{4TTI$JMZm~c%v3^a zJF{q!S&XpqznE=pXEqT}p-rN&8%%vgCQVq~P9{Sn(?eMEnvCVO`s`|_Gx;^0fpG9E zIzxnY?Q}9lI$B}zFB}vO3r8>=SO@E218js%uo;ek zBjG4G8jgWu;W%i40z`1Ua7?%++!vlBKp{bKGQYkqmNs)N zlWi%K3=;z&@0!L@qpI}v;pK0RY;$MZtQ}nnUb{2c=FWClQ-^8aXl-+6yR6Pb2gs_6 zD@@@yaC(ih&8_XmokWEsu4*r)_a>J%SM>#s%!a+ux6M%< zz!ZkLy)}UYwy7Vo_IEFMW9mn2tzQ;OlJV4itRJgn))ZI%4SFYS9gbQh9(~f_8F+;V zT?5a;bMQR8058Hz@Un1RI3b)AP6?-lGs4+5@G86pzk*-G>+lA=E}Rq23zvk;!WH2v zzWl9oLVH-dDfU<-(soPu9{ykpJ>Vl8dR$lmL*QdN)iY+g*!NMzbp6`O5{V$jdeP!EO>&2 z!$v~#!mXF#64?QVOQZwoC|<&C;TzlKCs`V>_oug_CDNUg+8~pj81lCmGAYN9@BJIH zPr*xsWG52)mNld==|}pL0c0Q`l>SwiAsb6WeekU>r|G9LX5R(|_Xtz5)B%ra(y8_R$$+e-Tm-vM1S# z>`nF|`;z^HUxZ(U7s7AC@4_F#pKCCdfg+-|AB^QM;b%Mir|qZxZ61;pki~64iZGDB zMIbs1+0zP10;*wm%{l^yh^ zq?DIU0+d`tm4Z=G9Ys{BSXE90$of$JRH(=_fC{97sLoU{6++>aC>??B2xK781A(3h z^g^KbTiQuQ+8Djk&OWcSbB{NbKqa^FOcHta6?vwJJo{mueS;st47R>P7XY z`cQqTeh3UeU?2j65EzWW5Cn!IFif22TPBD=X4^#Ho~NEFpxSJZ!ZwJ2R^*9|5P__J zOCJ=!6gX8*Rb$6VRZvE%lBz;rI088cP;)6OHIJH)K&c7=JpyG27!W8&paKD-D5QmNYeVIK3CTjOq1LwnStkOi z!a!d6jsMwzqrO656au3W7=yrA1jZp?K|okT-lJ|%H>q3H4SaV8TPOkuZvhc_2j6hE z&l6sI4U1zy3ir}QQSHorqJD0}_*BF=QN;LM#5n2S7@2mzNc~Pj5#b-ypVVK}-_$=e zK?4NdMPLd7QxTYkz;py=ATaYSV{)bWx2gVMIdvqHFXM? z4x&5KL6|A+LwBNmX+PSZ4xq7Pv?4GM0jx3$5O@!Pg$OKKL*1Z*$-8tHIvC$!ABSbK z*yhRJx82~6AG{%z=aLgIg+a&C32hkSMGQ+s3`rt}rT-R&&xH0tX>@nOrG>_>WO)mX zT}g`&pWnNC#(?5#{m_QG3X>tbSXJLxYOZW-AJK;%O1P}0`_ldB{&b%K^gwzLJ($M6 zpcR3Y2&_V2H3Dl8Sc||q1lF&mhY^0Xmd>KH>EUz^;fKHm0WWVG5!i&lhX{Oxz{fbT z5pOkW9tKy@co}Y`t7#LBmG=__wji*zm9C}hXsp275IBRtUOfFVvDJe|g2YwyD0(zK zh8{~}rP_|bX9(;=-~a+gUZq}WL{Ah+j;G(DCm?_gV zsiI-z5bMLiF4irBEtazw)H(XRm?IZ+);No_$I#^H@GSzT+7Mo(FSUWuub?lADJ$n; z=F;MkzQql`k;-^=tnZ-ylJ9L90s0z9Y#|&4^7X5|LEpkVOR=qmzKy{7ms?BvZhOxh zW82X0K;m-Y<^4lKzh2x!5*9Fl{)v7&!AntR^W^LjtO19o^lv!J~LDqYjt=5y7GRsQ^V7f3WB6KYi%7igp83hy0L@-JQ z$4}oO@Bo4D5qOBeBLsdx;70@=uVtbLKPH-qVKhuE;YU;=@DpYNM<9q0ynyhA%MtrZ zf62^f`+8y6c%-?pVOX7BUnsFE$~OjLd?L8+`jSS2L0>0AzQ7om zat3Ed86z>6sbZ?FTkHGz+X(~$etAE2lZ#x7# zAn?~kW+XETcN)!%Va77!7z-m1l~((zp&eKR{y~sO;BTRm)mWwJ%S<5jt;|Gb5;GY= z0znet43yt_W-2oc6PQljVrJ&_F2(0O6=fCrx=dTb4M89-m=F$YtO(cHY>Jt~%(dE8 zccND?R-90M*Z|!{=XSQ(M0^%v$S?>aG;C4#U_{9hUT# zz?cnKWKFniVlYvIpgk5U>>zT$CvMEgIDBKOu$0B{4d;@Xt;{y-;KneD*^WsKZVYWZ zR%3QDyR0`FJL8#tirev>SGz`k#(a)l1G5J~rxs=}f)c!F{8Jv$lR3Z~5+58y(7A;< zjG&9)Kde7afV2-h#+<_Gcjh>Af;owxD}rtay0( z#>(3i8o>wzL)*0(zeEdR&vwG<%=)r^ECw5fpaQ}0*Xn$~P3gL}DP8~KN_|;HmHwql zzOAXR8pR>_h(T1-^S1L)1FI6X6G5d-J@N6NNCaovBdj4V>0CQi>seMA^oDC@RW@e} zl{Rf-6GcfSA*dGotea|N)+!V4#-_2|v7WH$2x?l`3oTiIbmC96d+NyMFLQ=O9HJdtHSg2}Hmhb>~uvF5PF zYzeDlOIbZz#u^aphF}VUsR*Vah_Q4>Fk=l{!5Z00wu+g~nh5N1dmz{oL5yXn=ndd7 zypoBEGuz@+(^yhfp$pe3>cxzbzWrT~Vl7yo+7Iqto!hYj@e4bic!6Lq0n4-xKDmo; zlh7m)E_O=2+jVIw)+O=CPP|?p+qKi5!_E_R$+CmBiptdY|30jHQ<)aC@3$)x7GM82 zlnLw7a#5FB*cEImf&&m7h~S{tx@2>WuRP%^b?N!0yL;Kne%PjWgWL4(b#VJ{XO~@r z*NC1t5VmGC zA|2T;5zIrd7{^PnO7PF_r!Q;JR_L3p-nG)cIsI&_P=9<#H+)Eiq1^VQU5cl08Vr*@ z&7NV;vgZ)Q>QaDUA%aCKX)RF+L&PO+BVK4*#0AZ2tR0ud-eARu$aW~n-bS$GWkkf{ zh-d}-Eqf0^9fB3FA}IC&i!+<8?DyEHuIaXPGIB9u> zJRoJ($F{(?9q0@8&;KIw7bfx#f<}=@r4avmf|$VCHwkbQ$6(YPjbL?)m?;s173Xxb zsoq?r?@>|Jps(w1wmQ_=1=@2R-a0+xoH%E3qy)j57S091S}cek>*N*>JYUX}!+y68 z!Nynf<-E8~{{fZrCHy#l1nWhp4H)XHz$GAMp7&c&gSoK(BG45R2uH9g`nj%^khyvLgu=0DI9hOqY)f~ z;Mi7x!yYa}JQ_xD9NxR(#TbVO)?WD<3)hbu^nZ;Q+BQNE;sa7@mcNB7i_0fMS8>_g za4v_-<*@FKNAMj4Cm=Wx!AYyQ0!<^MzC0E5&b0*Hr)gbsTf>RKjir_Q^ zrz1FHHCM;ga}BhXYr-)toQdE91mClTwRkJMQDo;PzNis3#rWv4w0DEPx?YUutWkx2 z)}IRetOp7rtj>l0?J)r-aO3e_m%|=&Rttw`G#hKSxlm@|CUa9nEy4iiv~U=}Tx_SW zJ%epw=Vo$q@Od{k3+Gj!RcOF>oE6_8I8X2&^wJWz_qfHjPTV5fqxoX5S+-j%4l}Cp zB3CGJA3a*x)mJ&TtM6!)CbFw@(iQqyZzMbkCZry8m>k(Y^YRTa? zaUY3FWD*)$xQ`KB{QAijZX15WU_pWw8-~}9c5%C3v-%9d4}|#Wc3ykAeQ#UX0q(Fk zrGwld1eYSXYz6lvPW-{;Sb_Yl>xv>Hxs%*E?5DU>+-dF%cNW1G1Xm!4{q)L}L?w5D zyU1M*C@VpN$Bv#nC2$ z8xY)d0e5)FJ>q`geiTDR?kDSy#UbAKgbKlRdG-2+^v1e+bKM|wy)9DYe&(K82bM_b z72I86s;aoA9vjJP_U9~OsLi{9#0|VV@4_PBz1otAi55X@4W1%FhPOmf9mB#=7DQ$S&Tay;6iL#`}L@AW&$W(>8N0dsD z78Mz-i0+Z5j!x6Wb=RbJf8AXjo2HCY;kt=*O{`L()}$*HanUNJA|oSBlbX@JhbB%L z^}2V4GO~NLI!&X9PSvC-a9u^3B2JT*s!(^Z%v(9Eb5C_ zz6KJb(nKpY%2+#VMk?caMtg9&3qGsUjm^cULN-lrfP?wIW8{19w;9 zfw3wPO`I}49ivp^1k3B*acSL^sc|vUinO#iTuY+S;Erh-k&4uGRaCmFM_gQw*yz{2 zRdG?>BUN!daJ`ADyFwj_i%wE48L{b#IJG)5L)Bf=1OH~doWpX5d^7p0Pox?t)Q8&rc6YGAv_ZLH` zstcD6cL}p=PpO^yv?ET`Fugju^7%k55 zKqA)t0WZ)IbOL_3fG-_?4I&4B4Wa-{1atA19#-HlI(!QDfWx@%=>fEd4$uiY<8LnX zg#BPH{=R|^*5Klh@o*m81;51KK)8dyV&I6sP!LEe@D~XB;V%l*krVOP06xTLqK9$K z|1n(ee@aT8CeM)P$n)eyT=svJ{F=N$-Xw36cdRpWJ6Y}_fJ+#h1`Nf{U0<47rz^*G z!gXi)W&H9?o2M24!4WdTp9mwOiFl$LV~;a`KDdTGl8MC??A>tndJmix>x=VYrOY&3 zoxXwDgsajw1xH5egu1(*=oMF!4vh>TiDE&IlJ>0?hg$K+-T#DYw!ggiTaYgyN zxPp8KdyYNN-oi2e5A0+12`&!*33MI}(o2k#*!9?HwH)T^;=$!yLOhhC4<&#yfU%?B|&2nB_R!G1oEQvCOgD z(dby^XmYG^oZ+~|@tor?j{i78C(4O&a&nS7$(_8Ne4Kop{G9@wIy*%;B|4=#r8{Lf z^>OOwG{9+)lcmt9#HrM&)@hW}7^iVgg41}XX-+eoW;xAqvO3Lo`o!sq)2|XQNuVSc zA2x?c)VR{PnLd-4cO;V}QzQ!{izM$$mP(dO zR!BaQY?f@1Y?J)v%s4waJ3G5NyE}V2`#SqO2Re7QIEOfgI%hghaNgp4&H29b_s)-; zA3HyB{@I0fk+`_Kc)G}3yj((DB3vR}qFka~5?zvAQe4tpy1NWUqFWuwa$ zmu)UPTz0wabJ_25(B-hp5tpMb=Ul#W`QGJ;E9L6oDsgpjb#o1Jjc|>0jdG24)wqs! zo!~mhb%Cp8q3dGTWv(r*t*)zFH@a?dJ?whg^@{5Y*MHnPxkbCBxuv^xckAIc)UC{| z+|B4#R>8J;FWFJ=s0QJ{$7+wY9_u}BdOY&@(c>qNr=G!{YEO-4oM)nEvS*5Co~Pck+|%e; z<%vA!c`o%_?zzIV)pM2S8qcksM?AmsyzY6^^E=OHp1(GD7)<@P)Hb9mu%a<8t)iSfJPSzl6 zl38TqWfNqRWbezC$d<{L%T~x%$~Mck%C^gP$#z?0dt_H--^lLBzLh~A?Mx082}JIVv(LGoaEh&)u@RURi#lqbtm<>~Sa`2hJ~`A~VL+$gV-o8)GBt-M|? z$lsAql)o#VDxWT&FJCBMEdM~hS-wTSO}<^eQ~s&^OZg-DkMf`7Pvy_#zsO(6f0zF$ zxBTrzctJ19i}B*T?7TX7IeJBTMSE$y;=B^PlD$&Bx_kBX>f_blYmnDaFRj;buRO0p zuM)3PuUfBquSTzCuR~tvye@cM^19+3=pE@DNKR&uuj@eYddZ0w4>9mPP=_2z8!r#`TF?=_*#6Y`_A;8?K{`^yzedF zZ+!3i-t+6?7vq=V*VC`JUthoeegpjm`wjIg@hkN!^DFl=`c?Uv{A&E_{1*A`^t<5? z{X_iw`&%0QoBb#FPw}7TKf`~n|2+Q%{tNxr_^xOo76vR1_#j|u!191~0owz1 z2kZ&h8*nh-aKMp(V*ytKz7BX0@FL*%fIkEN4kQ9$AQi}10^I{W17(3;fgJ-o1^NXB z1O^563#<&B6Syt#s~{pMBq%gU6OVx4yg$l8!|m)R><6t`5_BK-Va$C z(h~A<$d-`pA-h683;8_ci;x2$he958vF{SuC9})uF3Y2j>gh;yUV>U z-*tJ|<%ceRcKIii3$+XF5Go4|2@MMk4~+~}hiXFOLz6=Lg$@iI5;`nY8#+8RFSIbU zICN6zhoKijUxfLDWrUT6m4%gu8N;f=Muv?G6T;pJdpB%q*o?4QVN1hW!afY!6Sgnx zK-l51qhTk)PKTWfyB&5X>|WS|Fw3K`$6-&xo`wC=wPV-Bt|eV3b=}zYY}elujKW^w zppYos6`l&Y!dnrh2v=wnaf$>*FGZFjN0F~6Qs@+AiV8)QVzgqcLQsrXOi)ZxysMb1 zn6B8OIH!0K?j4>MZU~ao;gW+exZ-w6pzh?=55dJ9q zaro2l=Mhu{6TwB;MRbU8jF3dQMz}}BN0dao8?iCsT*PlmsWM0zs_d$aP^y(N$~a|$ zvX8RAGDlgVtWuhlb;?HN2<2$yIOPoGEahC~JmmuALgixR2g;?&L(036c9G$c!y-pU zwnTmyxg~O2o{zi~c_;EwY0Wv!Ma>n>ea!>SL(LDG$C@XapEbW|Uc`2c&4{gxofW$+ z_UqU`;^jal_)W;&Lo;`Ef;Y=D51J#<&r2 zqvOWKp|}Zglj1hSosau1zGHlPyfJ=C{IvKP@r&b^#ka(-j9(YOA^yYokK^~o?~gwn ze=h!F{FV5x;;+X)jDMB@5?m786Ql`V2|fva34sa0384uI3CRg53F!$v5_%`}OBk3i zIALf)enNQyN?4e%DZ#Qo;abAa3I8M#i9v~76BUUuiRp=b68k3(N*tP)lbD}al&DM8 zCoW9fl6WHVV&bjDJBjxaA0$3Xe4O|s@$V!$iA%Cia!hhhk|ud2`6T%!^-gL|YE4?7 zv?Xa@(w9lcl1?U_NxGbLE$MpFt)y>~9wz;e^m8(i%qH6GTf$!WMCJ#x@OwLZuP0mj)ORi3CN*6&5X=U&g`2xAaii$ zu*|H?oXq@8V`g=xIkPUaF|#>yWajA1<(Y>vA8Tb=e{HBXN*kl?rtP8at1Z+PYmM4! ztyx>E9j8UwceInVmMPk4+Iiadw2QRwYgcMlY1e2!)*jM+sXeMau05$eqdl*^q`j*B zT6;r#OZ$WNvG$4fSyr#C%&e@e;aRy^UTH?nVM-_5?4{UH0HWq8-&3ByZ=&lr+ZG1oMAbJocD6p z=j_ROl=DxnG&d+WJ~t^hB{w~{M{e)jez^m4hva7FX6IJt*5uabHs&_xj>;XIE9AbD zJ1O_w+^M_w&Ecf0X}Q z0aajE;7}kba4nD)_!XoSWE7MZ)E3kiG!=|27+vsg!L))I1+xnl6|62;Ybn@Ju&H2s z!HI&i1@{YnD)cJ!E$mxZT4*S&D6A?p6*d=+DjZvADSWr^lfoT^w+p{7k`%cYB^324 z>RU9RXmHW6B5l#QqG?4li{=!~D|)YJQPI+(4Mm?6Z7bSYw7Y13(V?O*i;fkYD0)#W zDGn))ELIn5isOoV6lWG^7v~li6kCdmON$M~#^RC1WAKOZ#S@F)EuL09vv_v#lHzs6 z2aB&1KPz!5@hMT2bSvpq(zj$l$>5SXkmnM}~myRkOQ#!5`l};_4 zQ98SHZs~^7O{Jff?kU|@dZ6@h>5T0_BReR>WnqU zT4SBD!HA3#jFXL1jWdk1jIG9v#?8j9#vR68#>2*w#xoYl7LH^y&`_l-}C zzgM!Aj+M@pZk3*uK9zoz0hOIALn`Ad(<=v64z0|r%&yF>%&#n~tgJLu)>hV63YC*9 zr&i9WoL%`|<)X^>E0Rd`iol|^0Ettzc5qpDX`->LysgR1JQ=2We!I#6||>Zhu|s)=f{nyKciJ5)PW zdsla=_OA}A4yg{S4zE^L_pH`dmsd}&-d=sJ`hNBI)jw4KRQ+@Ha}#TFGkKcirj90G zlfNm<6l+Q{rI^x8JxzT~{Y?W+gG~9R5|iFkZmKrbSWNY%M$;(MT+=es3ezgnTGIy8 zCex>;J*Iu81E#~KBc_X{E2e9v>!w?#Z%mI(PfgEFFHC=!{xaK{9n2E5tJ%XWH3ykH zn}f|=%rWK!bFw+r+{4`4+}GUSTw!iDPcY9g&o*1l3(SkmE6gj+Ys~A-o6H}XkC^Y9 zf3C4`HNG`LHOV!-YKGM0)fj5(Y8q=s)QqedT{Er*)y%C~U$doVXU*=KJvIAkPS#wi z`LX8bTKn37+K}4F+99=BwIga5)~>4kq;^~F&f49zpVxj-d$9Iw?S1orm zroWo0X13X`*`e8~*}FNQxpQ-u=B~|A%`wff%?Zs(&4ZeUHALj||tYz&5v zp~JSJ!v_;&z!(hq&P`h69q;>nzmJlen6-EW$#3K{OD{iPgjgViU2A z_=ea;>?OVFz)MgblmFab;ipMX!nbT9*a4rYUSU_Mw3mVhSE47P#o zUW8ftC0h|U`z%Sq`xCX9++u%>48QcT+!2|FQ zcm`g8mrw$w&&5ffwN=cp2V@58y-i7kmUC!zb`> z_zJ!z3DTKtL%NV{NmtU1bSFJXe=>j!B$LS$GL=jt)5#379oe4jMs_EAka9Ac%pr5h zJaP!BBumH&vXZPK$B<@{ClNW897m2PCy<|!)5xV{WCPhqHj&NbGIBY&f?P>{Np2)J zkq5|w5d4xPlo*~bY=dk{Gn<)_`rX-Yjg07)!X#;JfhtZ>HM31Lu(zEF~W_muofL=l` zrJLzx^eTEay`J7c@1^(A`{@JpLHZE=9etSoo<2rjrLWP~=^OM-`WAhg{*}H%-=iPV zFX>nGYldI|qUA+v~SU>cbwW(Bj7*~jc>4loCqL(F%~ zVdi`02y>J<#vEr(FsGTHnXAk-<~nnO`JMTL`IC9Vyk-d&u#hELie*`jbzsG;3)_}; zXMNcqHinI5}GZgyOrI>e$DP>zh{rIXW4V?MfMtd zi@nSK#@=J^vya%P?7!>_j^F?XIgYdAB%G8pdvd;99M_)9Do)Fl zbJbieXW+(gW{&3&Hglp#3a~rrXxv#mM+&A1F?hyAKcZ~ay z`-%IRyUyLB?6le*v!Xn{+)3LlAZ{3LqLr{4IitJhFUUJ-j=;wJByZUZxM4t z%mOWY!hz^T$cc!R#K%N$q7TuR=tuM?1`t`iEAPR3@jkpC@6QMF!7GVuB8SK&@`!=N zAYw2vgb(H8_+&nfZ^w7!JM-Q6*fT^SCRao#h+;xHuwQmeiPEUf$KM8ZmC{r`RLv8- zJMX5DCe%mQms&Qu#&kPPs0cMtMreivl~yT@#u{a{dXVi^ZOrYLoh$Fth^w`O`epYo zsZf`i-sMqcrRQmR?vm>CmUFGO)Z5af?YpHzt);$})9;mzw3f;&pS)MfTT25hC9dyM zm|!gpvi$X4=_l6G5X&Z)R5zPAKO?3S5e>vNKCFS5!H4s)mP|MQ2;y^MP6IKUkKkj@ zVIj>W<`MIW1;j!uti^GZiqO7WU~9F8SZfixdosj2 zVm+a?#JI=$*($yyHsX2fY%nN?HxgeGT3hL6VvFTfrdt%Tnb=Bb3;JbuD=#&b>uQvS z;jKEfo%l)^^bS70f%uwFunpQw>=p+7EuZ+IL01unY~%6dlinK-AJt0r2yyHU)#H2$ zAA8!Wus;Y?Pw}ZAqFUQZ)tgUxqv02bOK+y+GN0Z`=c+*G8lUkYIzx%2Hgvv%v~4r{ z8}Y{*GJo>zTgf~S$UNjb{D+JgPwmK7I3A_b5!rTELzI!VjnLx*%@9`lx zpR`IjM3_6PbU*}XPeg2xI)O+K1)@O=h&6*a5DyYSB1i(sAO)m?G>{H5Ks){;{$sum z-;W=_%lRBWj~~Pj;S2a8zL+oJReTw*73g#T9YH6M2|9x=peyJGx`Q5|C-?~T0w06k zpbzNFSMa0xsr-C?8UH2!Eq{W)#Q)0w#lJ*=L%_;}mBQ(0!M z%u-0(<4Rx4AaB__m6g`YY=tyO0O6;v8!@6vZH&>ri$rg2ldF&p#%=moCJ%CSd9S|C zT0hWoYGB?wNJm&p2jkLymg6$+of@;XCf^e0+v6Q1NxbK2rBqW#11D5zdX^0656k z^TQj#ci=ETf**;4vPkUN3mhlrEahXIa>v>n=vHv5QE;8Dz0ZK3iHK%!7Mue=f}i*? zyqV{D)C|sp3*aKS#E<1C@{{<<*o*4L-7R`i4>PzSSmRB893Nx#f#6qSPBXXz?g}4% zJU_wuiIFZ2{Puwjt`skdY{Ga59^0@!!dRy?f+yf_{uBOFepFFwkm;kY(U`Ea$JqdQ zZiDVy)Y|2-5 z7zV>(1dQYt@C*4x{9=9yzm#uSfn|76Kx6$*#5g8lGehMY#4Ah7PNUwFbh0kF)X!lFTvc`3*6P1`v$B>MPVLYUq+rd9OLftk`4tze{F>o6w4 zPi(xWVBWg~-cvE}-5(fvWowt2aGro?7PP?6;cPeuegWt5d-%QlK7K!cfIr9|S^?+7 z1y)s9441&A{CE6e-a*iXqx>=cI0m#a7z0xmyuc7{{}%$# zwLl;NX@?<@kR(Zpq)CQkNshn6-{pVff9L<;|K#ss2&BV%YI*;^YRLf)Ptsqfm0{<1b2^RR`14C7|4z(xQ2Rl&mBeECyG1;4c#lJ>?Kmat8eFYav z4nP13J`@4^9Vbc-#7>kPgaFy%Mag`@i*ClDU^A(}CS%}-B0%vm($H2$rDU0P8b~!? zj{t+6C#mH>L4f@)I_gksr)siJkWUS%BlTo0X&{ZH2?4tV1nd!TK)?|J5dvZaB=5^< zREthn<%EE=MNk2)bSIKiY+xn}V4MV{X!RDlB-cLVbn**=4d@X z0^xM=e+CgJaHO@Oq z{FdB<-}dl7A`pT=IC2CL2t*1$BQc_l!44qf7Bpag-f?v%_OU zpcDTS0$mX3YW>v}5B5}&11N4wxm%f1ZUWOx%#`vJn0Ef}V136+k4c}jNS^Yi0&zx9 zVF`C{ps<8{zLx=0;X>+!Ko6V=W?1e^of4=hDjwSt6-~uZu@sigM+o#n;9~@OH&Y2z zB9%lXBhUwd!3YdNK!t58!fCq;)t>4o@WI3C+dy?fpdYT7Ug42Rb)|YVQr)QT2=qrF z7lA>o$UdU_5YA0hFY05eHv-s9vk;IsQGE%23b)MWu~Fn;kuI%_u^60_22ca3{13G+ z!0n3=$P?NR&N?RmlZyDJ}>Ps1^p+rO@ zWuod3P#{p;NDZU#1St_H!2(#;CW^(I8kCvhEw9_i*d_{5V=?R3Z91e=%f+Pi_{FN(bCD@!v}#X!N4^LR0nq6^NojJUs-`oWXq`K7Iz0f zjCKXJ5~Fo@NVXKZvtiU~YOTO*4Fb9bY8?W#?*rUq1E?3)OUbq&ZKb{zlxZ8ao!UWt zg@6G8BLdh1)-_W*!3Am;xQM_|ej)-Ru)`B_+)vHaK>_+91ctS^X6k$FnyDkyQQ?CC z7VmJ|6MN^YQcCURCVk&)OxQ$Gp*dDMSR#QR!nr%Tio!nuLEjKG)%>K6pe zJQ!uUoZ&l&x=H;>IIpB`QMajIsXNqN>No0l>JJ1E0%H*vhroDzJb(a(j-@zxC3O$$ z;REU+^%wPsdQ4!aHbu}#%pcF>R0KXlU>YyR`kdYF_fUqmCnB0?mgZ<|^)nEdiNLHT z+JSbYaWt?XupWU$SRCs1)&1L0J(kffbX(e$cB9=9z*9XRfyD?kAh7(cIniFUpFq=_ z_M!1wcQyi88@^~FchmkfHvVt~<{~f;)0A~sV2+?;KG2qqrQ-ztSZfwq`3GjUWlf9J=v2Dh2l~T0x&z&j$J4w70j$^Z4A~%Mg0W7etE_A7*_G}|M6~-4O!_0b z7ma;PBLYnbH1n~6om$o|rGzXP60*~Df5L$tKxb_p+Htn4d6`vH>1;Zu@QrbIQ<{`b zxG0y<=HY!Q{HvAeK)Q&CSdK+Am>xp=(gid&Wh|f-2&}|1LSPjFtCy3z!ChKOm*92O zT`Vsi&n;H;b$B^7LD(}5=+&)zXY34ymYaslEgN#3Eemta=1L5zimnzmIE76+!H_)F zTYkl}zSf3NN9%21)Qz-`&?=-(IXabcxJ+r1#m8qPq{s&JmHuX3ZP6yGM*|_|aj0l@ zk#s#h0vnuA*g%g&U}MXE3_Yf$X)$hV>pYg~vGmQ43B;V$)EascHHDr+e?ossPsKaB zed+1gZV}jm-3tQS5ZHmh*9d%rH+Qiw*v-ehv)@2}ZZqYr!b;!$-IY2$&sMX&WvTD} zKlV)M#kTsdgzXXMH`^n0ldX6sCYaauZShK5@ve6k{_oVTv( zmflEjqBql9=&kfNdOHGp5!i>oegqC6a1a6PMZQ}>J)pnFpKs{xgg^bQ)g}*HpWowJ z!AOr_vp7E3%MvxX33RmV8RB7K2jf%85k4ZD+8v>@`a4nISj6@7k`g*6bxll4?i$@a zp=;OZq?B%n(Ou#?$4AE}cS%j^k(Syyp>tZEqF;7KV&b5_%1U)vd6jzePxW4;xz{Oz zBb*3NB9MqC5{Oj1zn)DDCFbC>%LBx5;yUph0DMyE0=$3^KB@G_XO+Qt`>ZD@07ak} zpHof&bHD<;k+A_EHSWcSjHke#_yExfA0D=a33%~20G|eyKn*m(Vff^4E?x&6#m9KR z;@saEAJ8R-k@5IMZU8=i8%j>WhijY2o%k^A7!2}IyJ z0yhx2iNGxcZX@vPaweDw!4c&F6V5~+a0h{VR;9(h)Eu1%1rm#IBWZUj**+ zqgv|*Fj=;o$FkAnVwqOsU}kcefp1$6Lg25rt@D|}x0s3$c=RS$Vw6m&pb;2INdu!o z;PKlk4O1@k(jxGr!3qzLq}38zanvxi!bo(Ciyi^2ApbNn1`20)&xHAowe;1+$20ZJ zXkmVbGb5Oh%qRq&BY;)s1p+Ud!9~W*@C*_Xs8;VBM3O2K#)R^Ig1<2VZLDIGV=%pxX&!G%+iOYlR`BtFse;m z>kLMnVSvtP4J6EBW{E=D7EfLmrKwcg1D^wB)u|1`bJT|FMrJ9_(jMtkgg_rW!xIC@%g z>LxflWAI&dRaHv8QLXA}(ADWJ59)fF-2{uT*DLWkm8!2!rLO94J=`-Yq%I>z#zo2E zMn}m;CZxtk$gZbDT({Q~yzYL%M_Ej5=N{xE3 zv96@tXv7Askox?eh!oQ3uDa@KENNM6ozW0mQeG2VU4~&s2D zQall|1gorB+Ll^mmD_&WvGz+546|w_>&S}m$!xaT)W|x%+0$kvtP{3C7HbZEV$H!z zcFXFa;nl3GjZ}+ZSP#}qFk-7)XR&mnTiiP9hbNPjvHolTf-wjtA(;AhGTC4@9Q$iF zgbiiG5R64I4#D^)HiGbHqYz9GLP}!G!m-1!z)&`cP5V&$blkojg2_UAVeLL?m~SYX z$#(lt+wQn+PXyD1w&}R-v0>h=6UX*p2NDsh*}iN)wm&<7&0^(jHk-rdvUvz%`t1?y zfM7=iJ0X~fU}proAlMbbZmTiP!Gu4!$QH1LY!Rzqi&>?>pgUeCOhQnHpdLYNQ1cL+ zk6@FKg-Wxvx?$baC3PANqqc@f%k2F1Aw#N^!*zA0cl?oEO1TdN%!)?dQg#YnsIl0@`w7XTRoB_iSiBxx!A@hRvoqM4>@3#8evV*&1P36Pg`gb4Yy@)< z%w56GVZUJKGFnE!WP!NQi6B)jv2M!2 zuyJ_IKCzrCa-|#DzcGtbMeaf%VgF&DSsoNcQS5VE_@F4#(m@sHWb*+p1-ZULu!fJZ z%u)roa3n`#t>SQ8t8L&I1PxYgi#2ohoTE_TfS|E~!!gD5zPfQvT-y(*8|Mlxa_$J$ z2}2mikFs**yf9Y|yNRK1)Q$7wLjNyyGry;ATsRjY=o`_lMc;-Yh~v7TZ#<4)SlwC_ zfs5x-u)=+C+k#647r1o1Z2{}?wgnWnEn47p5a3}uAKs#DTxY`kzwKMJGWv+?ZPhsL zV?pEouRV)*RF2EyC=+UhsH*)njyW&h- z9XFK26M}X>xzi7v_ z;Vhi6kH%qNHKW0LNEd7AU*T<@&n?8owg|;7LU2|~gyNRsg$LKbH6mz1aL(J{#4Y1i zeIS5v*x7Sy5&T^6@3Z+)Z$=ZCIeo{ws|s!-xAkrRL2sfPw+$1(p6m;Oz+8URTPa`) z@2yL?UEJ>X_7%Ck+B&BDh$9umnR85;yBoEim(Q@An3Ap1b@Z0#`5r?3fw^0*!oh%WA|H&TP>vFtcEf zmC{-67I&Nb6>HTULc#sU{ch0|^a)tY69_gVxZy|cPwpPByw5%0ush@KaF2;*?g_YW zIako%j0L?O!Da87%v0{4R+GU2Wcm9hgWXvZ_lkRMhpDeXa3zAP{{L8vorBF{RIC3# zn9O@4uyesVr8YuL1ep}sW7bx_y7W=;~#w*2s*}c`n)vC^hQZ2r) zXE+yFeA zC$Ur5PjNmmmz~cp#8);O@m0+g>?wTx(%g<4$bEsYPj2P5b6?@hle@TY1tsSW;>(ji za~HTv+!gLBzCw8utI!?p3HQ>@&d$M3gfCEbv+HX&$WCdev8%GHvm0wS-fp7ZWV>B< zN9>N-ov{1Cp0;W1cen3rKg7PkzR14Veztw1eY5>?`<3>W?SHfX!~UMx{((cV zLxMw+LyAM1L$$*QhtUpZhp`Uh9VR+7I;?S6@9?F=CWr4FPC49kc;N8d;f2F1hu4n4 zk#v+g205lWraQKC?B+PYG1pP)Sm8L%@e{`;$FCgsIUaF5>G-qbJ;x^^D3XYrMJ^&Y zk%!1jlq$*;brp3N^%NC|ibTaCvr<$lQi}{ClL(2%izbSuh&~m4CYmFfCt4s{B-$j} zBHAX}F8WHeQ*>B#RCHYQgXpyAtmv}ns_44trs$dIU(rj^D={I4Vu{#U>>_p(dx*Wn zLE=zxxHwXrDefZfChjioDefiC6Au>Wi;Kj?;u3MCxJIlO8^n{$;wj=!#Z$%8#52T; z#7o7E;$`9$;#J~J;;rKC;;+Of#6O5ni_eJ9iGLE`6#pu|EB-@#Py9gqO#DLpNJV@#8(n286c5MawK_@L6RYo0!fjiSW+TUNy;QzNrj|JQX|nz43aM-^CSx- zizG`V4U#5_d6{H|WR+x%WSwM#WRqm8WQSy@WVd9GU9A>*ua>T<5yZcU|bZ*Y&QO#4XWnup95T z#I3=t*=?QMmu{Qf%-^~la69C7*zLI6Nw-sOXWY)a-En*9_LtjZx2NueJMHf5?&a>| z?&t3B9_SwB9^)S8p5UJ3p5mVEKHPng`#0_f-4DATaX;pM&i#t}Rrl-eH{EZ$-*NxV z{gL|<59q;q*m*d3NIjfATs&Mof<0n9Vm;zLk~}(l4DgV9p@~HOE zdDMCsJ?cD$c?|a$=`q@)(c_5615X#v3{Rye?>W|Uyys`0^F5b%Hh4C9uJl~(xz=;N z=Pu7Zp2s~ed0z3n>UrJsrsr+XJD$IJKJ)z7^QGr&FW^Ob(O#^VomY%kp4TX^rCx`; z{`7YA_VD)gmU#zwhkBdCy(7J&z1w?t^6ulE?_KDv@K$=4daJ!P-sRr)-Xpw6d5`ht zy~lcw_nzoI*?WWc3Gc@~?miuTN_{@{nd`I2XNgaP&vKuYKC6A!`t0=C?Q_)Ug3l$N zD?V3!uKV2dx$Seu=c&&#pMQN``n>i9zN9bh%lbz7=J<~AUF>_n_jj|Oy`Q6BTR%5H z55EwY^Usq?6~Zt?3C<`?5ga( z?4j(D?1}8D?3wIe*-L-3qrcc+>hJ9D;_vG3?(gaE?cdqI+<&_NX8-d6M1Ws_e?UY) zR6u$_$AHX$E&)9QdIj_j=o?TFpa`f67#T1+z#M=A#sy3Wm=rK2U~a(tfQ12z1C|Cf z1~dmO4_Fy+Jm5*7S74_=b>P&%HGw+Sc?hic}`d#SR(DR`eL$8G12)z}0 zC-k?_XQ3~`?84l`yuy6L{KJC6Lc=1$qQlyUbqvc4>k`&2tVh^KVZFoph8fIZ^TYOp z-3+%6j}IRZUKm~yt_s(LSB2Mv>%$G5IVBTFMciCh(VGV)QBM^wkCvM6Iz zebk7k(NSZg#z#$xni4fPYC%+U)bgm6QCp)9M12=^BrVDuGR~PjE_bNpMZ@NbpMVP6$qj zN$8N!En#3naYAWAS%NlUc*3}Zi3w8@rY1~JIFoQG;cmjcgog=_6P_i!NO+wH61hZ4 zVt_d@GBGJJCow;9Wa7-k#feK2mnJqQZb;mexHWM{;?BffiANHTC7wt;mDDw9KvH&6 zUee&Cf~2CP5lQ2cCMHcu`ZQ@_($=IMNna=JO4^h3ebVWqhe`h=yCp{_XC!w>&P?u_ z+#~s;|v zX*bgTNPC+0JndyVkxr&F>2~R^=|1VQ^uY9x^yu`s^u+X(^t5zk`tHE@;rvIG& zOZxTnTj_Vw@2CHj{v`dM^ye952A$!M;hy1_5s(p_5td<&&4|xP%1F&f&uE{~Jwu)` zIHMp#kx`OSo>7&d%P?e^GDc^N&-g53c9twFFe@r6Bdc@PM_IX9C0Xh$ZB}JgO;&A| zDGOzd&zhJuC2MNdw5%Cfv$D2lU6M2MIC;9fv;1RuUwNLqP+lS*DzBF#`FQz6`4ssa z`8@do`C_xYLEa=^E8igBDBmLACEqRID?cLtMSfj=OMXZGyZoN~q5QG@Z}~s+f8{T; z?Xw-T#o12T>TE-{DSK%4@a&`6KWAUazLfn-PIOL2PWzmWIh}K6=QQRt=Pb`zl}qP3 z=ep#&=6dAT<&MprnfrO}7rFCu7v(O^ZOUDqyES)5u6bwf?%ch(2XYVPexG|Z_jc}+ zJm0)td6jvS@($jGFn z7jOmk1)>5;L0Cb%g35w11v3lw6r3rzR&cN2VZq~qrv=XoUKG-W_JyKCX{lF699$e$98sKF zoKf7NIJ3BGara_*ac=RT;{4*G;^N}!Vtui(cxdtP;*rJUi)R+kDV|rnu(+YPxp+nK zs^WviXNs>D-!&KiQGCDnui_`guatz6R5D6CrGqj^*;UzJsZx$oBISH#vvR$1hjPF2 zgz}W~tn!@lC*=j@W#zpRrbJTWQsP$PQQ}<^UXoDqaY_FYO^LZ=e931e>q|D5oGp1; zN|kz*`j+~a29<`EMwCXE#+4?Prj(|awlB>t%_|*TYAz^MlqySArJB-;(&|!usj;-K zbVlit(%q#$mfk9TrV^_HR4FRCs!BCZHB~iTHA^*HwOF-GwNkZ4wO+MRwOh4cbx8HS z>V)c)>a6NV)p^w=)fLt6st2k^s=rnLs$Qvqnp8)sqtzMePUc7>`)c=-IWpo)==2YfZ=3N$E7F8Bo zmQa>lmRgoyrYcjHY0K)$>dQu!jVVKA=%`012wxn!r+2*osWnYzjQ?|eC zP}$+Kqh-g-E|%RX`&T2@xM_kkk(wAyyvCfQX{YI^$<%b!bk}5S3N+;!y~d~+su`}~ zHRCiBG?O)-XclRfYc^{RYmRD8XijO)YJSpO&|KDB)!fkB*8Hn^sU@^fOKDlHy;h`^ zYTIaCweH$TZ8xo4Tdp-}r)nFu2es$5H?O^1AYd@~_HIm0u{oTz<9udinkGR~4Xws$eVZD?}C2 ziZ&Gi6~Pr@6_FJ&74a2G6{!{J6+J5C71b4}Vo}A;itj2eR@|w0Sn;^xX~px3mz7MV zU8O^%s8U+#Tp3%LTRFUPZl$@Qvbl0a<*Ld}l{+hUReoE!w{m~w!OGK>KUJQuyi|Fu z@oiRobeGs)bd{s@7I*sM=JuwQ76SfvS^L=c<0L zx=?kw>UK31%-M+e0b?54S)mhcq)p^y5>Z)p8wV~QnJ-XUbJ=a{lzIuE0 z_3B@1oNKz&^sebwlU0*lQ&m$_GqPq(4XPPmGpS}u&BmJDHG69g)O=TSq~=)7shTS_ zw`%Ux{9bdf=1I*zHP35a*1XnnItQItC)N4rqI9vk1YNQ&P1jD>QP){FK$oq{(+$=Y z=oC7oPNgf;8Fiy{X5Cob1f6-ZZl>;Y-5lLK-2&Yr-E!S3-CEsx-FDp`-G1F6-S@g< zx)ZvKx~sbDx?8&6bbsjX>mKR}eOtY|-b?SR_tyvNqx6aT6n(nBy}qNqx4xf#fIeGa ztS{A<>C5#)^~3ce^<(st^q=d$(9hQ|)GyPo)UVO6(;w2G(O=U4V%A^R-_qaFKh!_g zKh;0eztF#`Wow;ky=#+dJJ)_(+qZT=ZFX&5t)jN1R#jV8tF5i5om{)D_HgaB+IzJR zYaiD>t$kMeuR&t)HuxC=48evlLxdsGkY;FS=!g$>`WbQ!gADnGB7@qXHB=a?@o8ec z0U4$lW*g=j78uNn4a*EG4XX|73>yqz8TJ`Y8h$XGGMq77HQX@VHrzG*VYp|6MhBzR z*v9B;^e~1Pqm6OKL}QAvgE7LGjI~CSahP$85gErBCmJUk=Np@h zTa4cuZx~;hfQd9QCOcDrDbkc+>S$7$s!ckR!ECBC)tf#u%`jO^b4>G03rx+XHKz5Z zjixQ8ZKnOEL#D%~qo$ut7fn}8*G%_J4^59uf16&{Io3()oanJGZ+C$HwI@03kF>V0|pZy?FeL<07++{oGybCP{fkK49Ic=t2O}g Z4S+0TpeP8tPCm(-LX@SO1Nm;U003@WCXE09 diff --git a/a2sudoku/make/tail.mk b/a2sudoku/make/tail.mk index fd961e5..95f0f11 100644 --- a/a2sudoku/make/tail.mk +++ b/a2sudoku/make/tail.mk @@ -59,7 +59,7 @@ ifeq ($(BUILD_TYPE),cc65) MACHCONFIG += -C $(BASE_MACHINE)-asm.cfg LDFLAGS += -u __EXEHDR__ else - MACHCONFIG += -C $(BASE_MACHINE).cfg + MACHCONFIG += -C apple2-hgr.cfg endif endif endif diff --git a/a2sudoku/ui.c b/a2sudoku/ui.c index dbc34c8..2ee60ca 100644 --- a/a2sudoku/ui.c +++ b/a2sudoku/ui.c @@ -12,13 +12,13 @@ #include #include #include -#include #include "game.h" #include "ui.h" #include "mouseWrapper.h" #include "drivers/a2_hires_drv.h" +#pragma code-name ("LOWCODE") // Macros and defines #define SQUARE_WIDTH 28 @@ -29,10 +29,10 @@ #define THICK_LINE_HEIGHT 3 #define THIN_LINE_HEIGHT 1 -#define TEXT_OFFSET_X 12 +#define TEXT_OFFSET_X 19 #define TEXT_OFFSET_Y 6 -#define TEXT_UNDERLINE_OFFSET_X -2 +#define TEXT_UNDERLINE_OFFSET_X -9 #define TEXT_UNDERLINE_OFFSET_Y 9 #define TEXT_UNDERLINE_WIDTH 8 @@ -92,7 +92,7 @@ void drawGrid(void) tgi_clear(); - tgi_setcolor(COLOR_WHITE); + tgi_setcolor(TGI_COLOR_WHITE); for (pos = 0; pos <= BOARD_SIZE; pos++) { if ((pos % SUBSQUARE_SIZE) == 0) { tgi_bar(xPos, 0, xPos + THICK_LINE_WIDTH - 1, TOTAL_HEIGHT - 1); @@ -469,7 +469,7 @@ void drawScratch(tPos x, tPos y, tScratchValues scratch) drawNine(screenX, screenY); } - tgi_setcolor(COLOR_WHITE); + tgi_setcolor(TGI_COLOR_WHITE); } @@ -481,10 +481,10 @@ void updatePos(tPos x, tPos y, tSquareVal val, tScratchValues scratch, bool corr int edgeY = screenY + SQUARE_HEIGHT - 1; char buffer[2]; - tgi_setcolor(COLOR_BLACK); + tgi_setcolor(TGI_COLOR_BLACK); tgi_bar(screenX, screenY, edgeX, edgeY); - tgi_setcolor(COLOR_WHITE); + tgi_setcolor(TGI_COLOR_WHITE); if (val != EMPTY_SQUARE) { buffer[0] = '0' + val; buffer[1] = '\0'; @@ -530,7 +530,7 @@ void youWon(void) static char line1[80]; char *line2 = "Press any key"; time_t solutionTime = timeToSolve(); - int textHeight = tgi_textheight(line1); + int textHeight = 7; if (solutionTime == 0xffffffff) { snprintf(line1, sizeof(line1), "You solved it!"); @@ -550,10 +550,10 @@ void youWon(void) wonX = (TOTAL_WIDTH - wonWidth) / 2; wonY = (TOTAL_HEIGHT - wonHeight) / 2; - tgi_setcolor(COLOR_BLACK); + tgi_setcolor(TGI_COLOR_BLACK); tgi_bar(wonX, wonY, wonX + wonWidth, wonY + wonHeight); - tgi_setcolor(COLOR_WHITE); + tgi_setcolor(TGI_COLOR_WHITE); tgi_outtextxy((TOTAL_WIDTH - line1Width) / 2, wonY + (textHeight * 2), line1); tgi_outtextxy((TOTAL_WIDTH - line2Width) / 2, wonY + (textHeight * 4), line2); @@ -794,7 +794,6 @@ bool playGame(void) youWon(); return true; } - } }