From c4430864a5db64bb0b1fcd73483335110af1216f Mon Sep 17 00:00:00 2001
From: BagoZonde <bagozonde@gmail.com>
Date: Thu, 14 Jan 2016 01:36:11 +0000
Subject: [PATCH] C64: 2d proof of concept demo - fonts added

---
 Platform/C64/README.txt                       |   2 +-
 Platform/C64/demos/2d-demo-2016-01-14.prg     | Bin 0 -> 43137 bytes
 Platform/C64/src/binary/fonts.map             | Bin 8320 -> 8320 bytes
 .../C64/src/includes/tables/textTables.asm    |   8 ++++----
 Platform/C64/src/texts/text01.asm             |   1 +
 5 files changed, 6 insertions(+), 5 deletions(-)
 create mode 100644 Platform/C64/demos/2d-demo-2016-01-14.prg

diff --git a/Platform/C64/README.txt b/Platform/C64/README.txt
index 682db5cf..48dcc8c9 100644
--- a/Platform/C64/README.txt
+++ b/Platform/C64/README.txt
@@ -18,5 +18,5 @@ Features:
 
 Tools used:
 	64tass compiler
-	GangEd for tiles (data saved separately as videomem, colormem and bitmap) and fonts
+	GangEd and Pixcen used for tiles (data saved separately as videomem, colormem and bitmap), bitmap part for fonts saved under fonts.map filename
 	SpritePad for sprites
diff --git a/Platform/C64/demos/2d-demo-2016-01-14.prg b/Platform/C64/demos/2d-demo-2016-01-14.prg
new file mode 100644
index 0000000000000000000000000000000000000000..d747ebe8bf67a666ee8ba9577c65901eaea1437a
GIT binary patch
literal 43137
zcmeI54|tQ+y~j_Iri3)5X=qA7FfacK)B-7#Qnv0Xcw5K3-L$Sj=34rPrZiX@NLv04
zEK}ZEov*^Co3Ho2Yi=*EBfVC|&1u|RI}t{^I^O-K9ju!h4EIN~O*b9Y+}}ATp?{Xj
z<J5Z}x8Lsx@A;m8zwbGpH0R{u=>s}bipfmAyuy{AO9<H=YL!yYN~z~Ut3+MseCJf@
zt?0ecXh<i`(n4L5O`A4T%Sk<(0|SU8XwqCwG>a*sMNAdviu1%Jp(N2M3f;sdPV3gW
z#I$a`OSE<yTw*%36})5;7eaHvOGM0q9$H@nowUB#p-%Ja#JOskmx%L1q%){QtCWsv
zrKm<3u2EWR73XH9XR}gOr$p<N4v$h)uMF2Kty>glgVNKWRC$%CSLxWQ6y2%}->S4W
zD$Z?6&o-s1Nr^To9X_RKyE438Y2BeX{YsBtsR}63fYQ;d6tyVBElTT7#kouA*`-wN
zR-(I=jy+1zUS)W%()t<2xlifYr&R4%qWhJO+xjDh(g#f;UC=5^6|!_jezHP-@{D}0
zLOyp!Hde~UL3wGVymU}@SIX`|d4Hw6e^6E{Wpz+~p;CTfP=2jaer-^mvq_#aB$sTG
zONQiao8)an@&lXX2Zq|UQ0T)_x)yRsnOaCMk#nKll0(}lJem?}lHRBa`J~sYLI%mM
zb<ftOMy1(W$RsV&;JsL^LGwZl-l!~EwbI8`n(&ZSIA$$<aq9ZJ*FU)a<(XPHsfZXM
zv7o6-BF2+TO1&u#b*0BCu2S;=eEtz3Vs)siJaeHT-!o6lZ`UFrT@E=Lv4q}~$k}e)
z*}gZmj|gs?W`Mb&WO0dV>C+vWtqOg{$1_h_pcd8iCsSd?F>`N<Dnv{th0E1Y()fIr
zAm6Gn`OGYzljSq3W|l8yTs|k{bB^XS@qCwJ>${|_6H3P9OF5BsC|Nb1SopX@b@nA4
zvRyE1`U?{>_L(B43uAKX$FFf1a(c$(Og*s}a#~I-f}8@&X@Q&*cFl5**>`+_Z)(nN
zU4`a^H%nIm@5sk=5}~D*%05)3atf5X3iv1jaQ24L&sxLLhOUOSyiVUhM<~f-7Uzdt
zo)mF`nyMwKmPod05wB5G#T<t^AKt_H>H>HV7pT`1yrhHn9Qd5&sMlyOsyW)vVT8C+
zT_ENK$+7vJBuIoyX+a%G9hZ8LdM*th4O}LHOybfA(#T~p$Yd_3fSkgm38ab1ajS{>
z=|=sS<bF(YKPI^!liZI<?#CqeW0Lz(naEE+>c=GaW0LzZ$^Dq*eoS&dCb=Jz+>gpc
zeuhy$Cb=Jz+>c4_$0YY-lKU~q{g~u_R3`FE8ueq6`!UJ=nB;y;az7@yACugVN$y8w
zB0uA(ACugVN$$ra_hXX#G0FXy<bF(YKPnUXC6D?s$^Dq*eoS&dCb=Jz+>c4_$0YZo
zGLheuQ9mZRACugVN$$ra_hXX#G0FXy<bG5p@-vP4G0FXy<bF(YKPI^!liZI<?#Cqe
zqjH?z=!sG-+S;Zc%s3jp!zS9p$8BP!LxtK8?VjmJ!-nbNjBw?2(Gh-Xx;QhOo*~W(
z-<ly_6+V$6&JH{6;+*gvyLffbddz-!M!WV#r!^>moY~&5y{_8K=B^-lmb4$f>S9nA
zD;LMgC9Lf4@24Z~Iy{GsU?q%TC5(Ww`iL`p)-DlE(rZVA@OitW(<Fmd9khlByLsW-
zg*z86T)1uFs)c(NE?Kx?;d+I;6)sk|Rfptfhvf5cvA*C?&2Y~xRa4-eTjo$L9zk5L
zrb5N_X#2|0U1Dx%rMLnPr`!`uwJbOZb5AVOt`6#<T&`sX4N$tYX~Cppxm`iyvD~9V
zX?nFo&GjaWx#|kYvZ7ymuKM05((n0d`n@x3_c&~!sF*FT?j&t%+6s<jpSmby+TbcP
zlpam*6L<k<c7JJodY@S{b`og+h4s)37+-LT4izHF!YmuKURVPU81`_%h1D0bFCNJb
z=Ru;#zP?n*@(7)sB4pb-2_0Qab0<R;l=PSMBdf!&W=hj+;a6u!Y4CJNCV0-2rrLre
z{IXq2v4wYJN)}rXzR*Z{Hb^Yz+1j-~m3F0rhV8As9>NUaO%qpFt83sZ!|Ic3E>>5o
ztLT+7U(JUrWkG3+O<m=HZ*Ncs61-k;p58zC=i&b0{p>!X-zjLFUIKl(h#{n_4w34p
zv#6@Iqi6UZEn5%7;<K^1Jr;Mw;$SSqShU6BP98T@`C9Mmc&z92>ETzRY0l+EH@sIZ
zHSyRCQAeXb9t{v)8n?z{8$=V0?eXwK1ZcFxV;9738hpX9UcO-1!F$zG8;?3qEVjhM
zyEPV#@o4hJVn;jz&9T@SkKKD>k)5;5wIVOS;6r=&-FD#igKh11_YZte`@xTXa%O1O
z?5l-&3$hkxZ*6Sa?r+|?d+#&f{8sOC&!0TiZ?;Uc+A=a7vu>%_R9#zF->|jokw+hY
z;%i@j`kB9tyhZd$$tH8f<WV_!Y<k<MV)6d1`OM@oIC%`cZTyVIRNGYxmgX0&FU!im
zZbSXfwl6+>{ViMf-u+P5GyTyiX)~OQmai`Q=nXelZSn1Dz4N{=b$sQqr+U6~`lrLc
zdF8MF2mSXQx<VYjLVW%T@r5hI{r6AY_r(2A<S>!f2Yo&}iN-wQA9N_=$5Z?x&q{h$
zjSY5gjd{e61t{Z(S^R)tB|X{320P`(JmQB4l<}i4ew?t9o`Yk9orz-}@goPy_(2&z
zd{{|O&9QOseTNQz{tNd%@Wn4ZC_nTc|EYZasi(uweB+zXeygYV+s_?;{>0CRfAPx~
zfA#D07k+c`rQiPU_kT#9Vw!4Bv7}B*v!>goXV{l5cjc~FnYSu`b-|hseYo%=8*bkC
zsarl>QMswAx~6t>o#(dJ1E0P9j)P*`o$Yts{keOjhre<()b&4)bU*so<Hw%(>ert9
z-f8XoKltH~e*BZ4o*5ka+1Yb{`RnU%{O!`nn{P#lPH#vuUhNd-&YQnrVb-F>OR}%Y
zS$f?^*MIE#e=q&`CvLd0?50nayPJI5clZO%EjxGZ-m~{J`}W88@#T)-e|7%%5jDP#
zlixYj*Z<vt7vlSP`IX2Y|McfqUz_~oN!&B}ar9pIyzS}so^`_CbYUO?B!C2v01`j~
zNB{{S0VIF~kN^@u0!RP}AOR$R1pes>%pr4#PN$zVbkJ!q7$)n7nFgH!D2*QwOGtZZ
zr(s+-O-X}4|GtxVvtB}{k4-&(E-Y+ZZ!9G%pbvt3jLpD(*^Uf}HV!lRb|>rA8}vmK
zNrKe0iK2?}8o##q;^MvI7j?OJLUXK|z%21VY<+hG-WGJCpO;a)EA>v=4?om8eG*9`
z53Dp2Gg+3mP6)KrHaB{NTEEA$*CPa)z5aku*Ai$JYBu|Qfq>B5;1TNldxSbqz~gTg
z>KlDN|FTr`r+h6ixTdL2sA*<nJRp7bOg8$Owg}Ds8gHXe@AqvJuJd~WO+Mk@Y8t)u
zK7W(9Mrii2fuHnx{Qer@6P}$lbv44reJxGRHQuHGq>q+^?Jl3M&eH@-^VV(g2>zO8
zSZIK!q^t6`1RAL2u9{|#U)W05T<dA{?V{8F=}%MKAQC_VNB{{S0VIF~kN^@u0!RP}
zAOR$R1dsp{Kmter2_OL^fCP{L5<mh-00|%gB!C2v01`j~NB{}^s}ShwI`EEO6Sy28
z2gtlm`pWJimgh;@t0b+N7&HR^c%S)c+O8MKs+&pP6p~>ii_H_JlXgPzxAG=J!8#H^
z0!RP}AOR$R1dsp{Kmter2_OL^fCP{L5<mh-00|%gB!C2v01`j~NB{{S0VIF~kN^_+
zpb!ws=a%QLwH6x>lpVP7+ezuxwbt^oVt0A5&Q+dUE|7sgo?O$v=6U=2+FNYvXBB52
z%s6a4R9sTFam&Wc68E|cx7}S*ZZC1Wi`@`*cUf_nyVy>3ncH3Bwil<bGnUwm_IBag
z_G=%!_K;C;b(Ooyg|&nvr5C3ce^5B#I*|YpKmter34D+Uz(riOJrLLor8@Ogd%M53
z`uepuy4~&V@Sk(*;Fd1iuyI{U$+`_R>>D>;m?YZTE_cAd%Q}G=9hji=-8E(L>D)iI
z3RYZRQWhPu5Q1)p#mx{K;KgI-4p!cD6D@9nFqw2ZBO&mjq2on@r*87D1f&0do6N-g
zcfaVJXhrnD_D$4|ZAbtKAOR$R1dzb{LBREXBz;FYT>}=2i;S+rH83zRGB7|Q0|WF$
z3VUf3(mF(hjP&+KdV5F6$N(*SX+N|V5_rJ00W#vE0sR&l5onLlsf1>s^P<t{>Ep+b
zL;J`G^>IPxz<`VS!GKtOq>!4!ADZ7q^NjGs)Q64dg^NJ0KS!g~-$hf=emWBTT`ubP
z&V!~YBCt&;BQTv3C?pn3A=C?LeIP>XbeGh~0^?o1Fo=$a{g4RlAr_cnu|Q8R<p?~X
zm9`TC8;3d}y^I%OJEr`ZUoXuMJ{A}k0l?5+2mm64nYo~u5uoE?7}&FNgyw@P%gd(2
z!hyg)w0}s2fdr5M5<mh-00|%gB!C2v01`j~NB{{S0VIF~kN^@u0!RP}AOR$R1dsp{
Icoziz7q*Q5y#N3J

literal 0
HcmV?d00001

diff --git a/Platform/C64/src/binary/fonts.map b/Platform/C64/src/binary/fonts.map
index 4efc0ad4fc2a55cff1e9de64c3ca2a659e62bfd3..af5952faa221107f5a76d491bf072d1ddaef3621 100644
GIT binary patch
delta 223
zcmX9&!3hFE5F7QS*n&L__}$M{U^jlf7OoS)1_t&Uu$2YB17mU<mK`>kB)cx_@;)D5
z01~hP=vWJ(=}ipFh!K&N&<yG1oAIIzmM&1g3WNNR)s!M%RegK!<TKUd6anA+xL}V-
nWTQ(?6}W<OCaY*S%;CncUzI-KvP#z`Kj6;7?Qs8GPS4vPy~={$

delta 57
ycmZp0Y;fGb$t1_abLP*PGYsg!04RRu%!i4LmF$21FfbSx7))eL-ps{ZCJO+rh!0W#

diff --git a/Platform/C64/src/includes/tables/textTables.asm b/Platform/C64/src/includes/tables/textTables.asm
index 1f0c4777..4fa4745e 100644
--- a/Platform/C64/src/includes/tables/textTables.asm
+++ b/Platform/C64/src/includes/tables/textTables.asm
@@ -9,28 +9,28 @@ fontsTable_HI
 	.next
 
 textPortTable_LO
-	.for step=0, step<=13, step=step+1
+	.for step=0, step<=15, step=step+1
 		.for l=0, l<=15, l=l+1
 			.byte <TEXTPORT_BITMAP_OFFSET+SCREEN-1+step*320+l*8
 		.next
 	.next
 
 textPortTable_HI
-	.for step=0, step<=13, step=step+1
+	.for step=0, step<=15, step=step+1
 		.for l=0, l<=15, l=l+1
 			.byte >TEXTPORT_BITMAP_OFFSET+SCREEN-1+step*320+l*8
 		.next
 	.next
 
 textPortColorTable_LO
-	.for step=0, step<=13, step=step+1
+	.for step=0, step<=15, step=step+1
 		.for l=0, l<=15, l=l+1
 			.byte <TEXTPORT_SCREEN_OFFSET+SCREEN_COLOR_RAM+step*40+l
 		.next
 	.next
 
 textPortColorTable_HI
-	.for step=0, step<=13, step=step+1
+	.for step=0, step<=15, step=step+1
 		.for l=0, l<=15, l=l+1
 			.byte >TEXTPORT_SCREEN_OFFSET+SCREEN_COLOR_RAM+step*40+l
 		.next
diff --git a/Platform/C64/src/texts/text01.asm b/Platform/C64/src/texts/text01.asm
index 302400f6..d8e90f20 100644
--- a/Platform/C64/src/texts/text01.asm
+++ b/Platform/C64/src/texts/text01.asm
@@ -1 +1,2 @@
 A subtle breeze stirs dust across the dry desert floor.
+You stand at the end of the long trail from Fresno California to the Sierra Nevada Mountains.