From e9ef3f6a6484c16aaf0f5de89c222f631ebdd10c Mon Sep 17 00:00:00 2001 From: Rob McMullen Date: Thu, 17 Aug 2017 10:12:39 -0700 Subject: [PATCH] Added pre-generated HGR screens so you don't need tohgr unless rebuilding images --- Makefile | 21 ++++++++++++--------- kansasfest-hackfest.hgr | Bin 0 -> 8192 bytes player-missile-2.hgr | Bin 0 -> 8192 bytes player-missile.hgr | Bin 0 -> 8192 bytes title.hgr | Bin 0 -> 8192 bytes 5 files changed, 12 insertions(+), 9 deletions(-) create mode 100644 kansasfest-hackfest.hgr create mode 100644 player-missile-2.hgr create mode 100644 player-missile.hgr create mode 100644 title.hgr diff --git a/Makefile b/Makefile index 2262520..1700f9b 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,4 @@ SPRITES = atari-sprite9x11.png apple-sprite9x11.png -CPSPRITES = apple-sprite9x11.png moldy_burger.png TOHGR = tohgr A2 = build-apple2/ @@ -8,31 +7,35 @@ all: working.dsk demo.dsk build-apple2: mkdir build-apple2 -$(A2)player-missile.hgr: player-missile.png +player-missile.hgr: player-missile.png cp player-missile.png $(A2) asmgen.py $(A2)player-missile.png + cp $(A2)player-missile.hgr player-missile.hgr -$(A2)player-missile-2.hgr: player-missile-2.png +player-missile-2.hgr: player-missile-2.png cp player-missile-2.png $(A2) asmgen.py $(A2)player-missile-2.png + cp $(A2)player-missile-2.hgr player-missile-2.hgr -$(A2)kansasfest-hackfest.hgr: kansasfest-hackfest.png +kansasfest-hackfest.hgr: kansasfest-hackfest.png cp kansasfest-hackfest.png $(A2)kansasfest-hackfest-top.png $(TOHGR) $(A2)kansasfest-hackfest-top.png cp kansasfest-hackfest.png $(A2)kansasfest-hackfest-bot.png asmgen.py -i bw $(A2)kansasfest-hackfest-bot.png asmgen.py --merge 96 -o $(A2)kansasfest-hackfest $(A2)kansasfest-hackfest-top.hgr $(A2)kansasfest-hackfest-bot.hgr + cp $(A2)kansasfest-hackfest.hgr kansasfest-hackfest.hgr -$(A2)title.hgr: title.png +title.hgr: title.png cp title.png $(A2)title-top.png $(TOHGR) $(A2)title-top.png cp title.png $(A2)title-bot.png asmgen.py -i bw $(A2)title-bot.png asmgen.py --merge 136 167 -o $(A2)title $(A2)title-top.hgr $(A2)title-bot.hgr + cp $(A2)title.hgr title.hgr -$(A2)title.s: $(A2)title.hgr +$(A2)title.s: title.hgr # use legacy block format - lz4 -9lf $(A2)title.hgr $(A2)title.lz4 + lz4 -9lf title.hgr $(A2)title.lz4 # strip first 8 bytes (start at byte 9 when counting from 1) tail -c +9 $(A2)title.lz4 > $(A2)title.lz4-payload asmgen.py -a mac65 --src $(A2)title.lz4-payload -n title > $(A2)title.s @@ -63,8 +66,8 @@ $(A2)demo.xex: wipes-demo.s main.s constants.s rand.s maze.s $(A2)working-sprite echo '.include "$(A2)title.s"' >> $(A2)demo.s atasm -mae -o$(A2)demo.xex $(A2)demo.s -L$(A2)demo.var -g$(A2)demo.lst -demo.dsk: build-apple2 $(A2)demo.xex $(A2)player-missile.hgr $(A2)player-missile-2.hgr $(A2)kansasfest-hackfest.hgr $(A2)title.hgr - atrcopy demo.dsk boot -d $(A2)player-missile.hgr@2000 $(A2)player-missile-2.hgr@4000 $(A2)kansasfest-hackfest.hgr@2000 -b $(A2)demo.xex --brun 6000 -f +demo.dsk: build-apple2 $(A2)demo.xex player-missile.hgr player-missile-2.hgr kansasfest-hackfest.hgr title.hgr + atrcopy demo.dsk boot -d player-missile.hgr@2000 player-missile-2.hgr@4000 kansasfest-hackfest.hgr@2000 -b $(A2)demo.xex --brun 6000 -f clean: rm -rf $(A2) diff --git a/kansasfest-hackfest.hgr b/kansasfest-hackfest.hgr new file mode 100644 index 0000000000000000000000000000000000000000..43bf3d9057718b6bc71ed4039f6495d7dffe1438 GIT binary patch literal 8192 zcmd5>PiQ089sViPjy53T9ugQz5lc%ip|m=sOA+#%_9S}B!IviQq|;L75;~Mw4bnIn z*TS7B#K{V0k@5Cmegzkm<7l;}Kf4}Vo_lfCwcFoUSqtDk1 z4~J)PayheHpbMkV9X~5CIJ2)7#Y(OiCAHlwBvH$6;l^&enr|gYEjQziU5q}PU3@6~wG>9BMRW(&F^l31kt)y<(JD$k z+TD29v8&N1r<^I9iCV5mQK^`S=ZQ46+pbxZ)DAkW8qUYlyNexxD6Q!!@n<6QU`jC>CiBZ&cbYAO*`}RG`>I{Ft0teoXPV~M6xSZ6=b3&N7+GN$fDHVHqale^F!50= zgh5t}RPGPXld@~T*ZRo^JdJkHtyrQI39Y;ml2hTB+G(1G6-$!RsaPQ+s!DR%bPUt! zL}Ss{uRz4ned3Wm�CQ@T;e#4UWI8V}sd+NqPCmJF&>+>dJ~pEF$`u==$2e(3{l$ zkynuQjV#9RGtF(Xka&wizyXQe>lRr&^(aA7tMzvvdOYo{?+YIgfLVHvC<+UQ?Q{J1 zQuKRNa{H&f8!rCFpPq0o!T+t?qAOB2A%b?|Ik^cM5<|RxKnKH5)z>>hiRLx^qxo-w zkMDgsKd%D+pZ{?+-N*mue_oaK8y^1bd^8XI-(fa@YQqTt@ErfV&`6xI~}Z(T!jP1w5Q~JM7*MML!d;w8M$1^8K`$>>P)#i z11CR}U5iCPJbbx-^2IAl@=^o~P?T#qLn3Ek@+>shY{ygH0xTCA>wbQ8VS@3T+!lxo%JH9ziBU0Aw*Za8j<4S~CXcf$XJ0pW%lw?HZ{EYR&T$?3cOw7J z(l;I)H%_;IuVuJD;Gc2)`{~Q_H2zNy;XhONKQ1)_{@-%AjyM5>|EsBgNdy|0gnzF8 z=anE`D9tN@Yjo|&41GdoDQBnYtx~QmeB9Ql>*;^!Z|H8=e+{Y^_HWx@O48)2?Ezp6 z|C$6MvS1Ht$C$+b*)>H_(F2|H?_>QAy~TikJy=Qsl~@2!JN0gC55~{zd@SbSU*-B+ zwi)oRcN)>T|Z0u zjPCJ)|4d(-Qaoi)+`)fQyaM495=nIMpNgPHdk(vbcFv!e?0*5($HD4 zqBg^7d{o#+0`^k&>tTDjId%VT>si_u781lW~b~* z)y58@pXN5j%JtjO|HZZl^o2P7mw^AdP2k^KcK2?F|9fUyz6$=g_Je8cJ?;neK!6F! zOet4{e_^D0_=EomM;-m|NdFk{&)@_`@L$BfgX6#0x}3kA2w^28=zoplALbYT2k<{M z4-Wp#;|yR8+36SL2zb8JG{FDSc#gHqA5b)2E}}k< zIM9e$`a@p>`tQWO_h4@h{%7SPGsV<%bDJ#$!eR+c=^BQWS0V}~o{E|(RmxTCk~@L* zLgV(Ye*MNTPC6bfHrD5X{?pRXF8s7xz3cV0Df~Y(%>VU){&jg^JSTGa=OSLq`Jc!C z7&AsD+G}yNkcI#0wR`#E{iN`3{nk65JgqiA)P=y8;Q!~p^Ub2maMc6S_mxu=lRvd^~aeeVCDmIs5-N zdF)}2IO@~M8N?rEiS~qD4}WOi-U9xe_#gHwz`p`dP%~BUy@-3nA#-7F&N^t#e*7<*q)M*81f7<-)$pzoV_29{+!RWdD=j@oj2%c>F1S2=4|e)!{J^ zb#m-qAlUvYj$Opx&k%nb?aUb9j&Di&@ptpFj`(+QKJr}~SO^F|eHHNsAvwd+FT4T# zZ)^|Z55S*lY6@cOK%H!H{#BYh{>Hx^Oi1JHji2}T|2^{qVu=3-_c8XHh`(dhEXDD^ zibEBK8lj~&MUEN~N}PABp2j6XBX l|E~f61OJ1sSw8T8TCXl}{y%O3LCsx$BC1pzA%&|{DJWA|kq`w^8jg_O6dZvvZ5oRbAv#i11PM=O z#^&Rdmz`Z~z``KQEME5QeBQp%;CW@gexlg){wy2wbUnm}MFP=g7Dq6N`5s5RX}kv9 z7v7_|a{SG2il58(QBV+!Hc*Q)i=f8Jb{`X<% zf$97szSoQY{nhtZ`=j@_8cNegJCEa95B}@)2lH2}KU%wOACR9|`%wQ6`ghcS)WG6% zvP}MyCQY>29jOXqo$5bgYwAk>wKo{HUY5Q)?*5lB7LU}nIV#$P&5wYCfDH~BHyRU!Y+YCr9S{hH~2o%la)KZVPn6#aKNSMxEv#)#w8 z@W0`|K3fZP`h4%Bw*1HXf8e*mrPsQcdamdC#lV&eH2mlOn=Suu-GB2s@5cT^h5Bz! zvU=)&@QnO_do=#L^xw=GAe%vX;?jRJ)&J7-_sscs&;551|7+KOlckJk7RS}L|Ki<1j{a;7^H~+tx^}pf&?f!q0>W}C!J52fq7LY;N literal 0 HcmV?d00001 diff --git a/player-missile.hgr b/player-missile.hgr new file mode 100644 index 0000000000000000000000000000000000000000..738f0ae4570408e511f5675186db5bcac1c09595 GIT binary patch literal 8192 zcmeHMJxjwt7`{O=1reuAoy0jmphyQte?)NTT%0llp*RFwI(Kq#i$e#0KqwtL>Jl7_ zxalO)rO=-5dx_edIqxG0HIRnTUX$GOem(bG-x5;w>oH1X$92`1+w%cFU2JHyjFX7o zCG0(k)|2Fwf?e<)CAH%(-%|VxkE-DJ!ohIc5B{@iT+x5Ji_^^4bjki}VNTSExT?$2G5DoS623 z{(tM=kN$%O7O#_4@*gz`_a8d?Um^dM)(JkW3jD{t1LGg+ZmPfOzJh6Twy%Kr%Z>t_ z(&InVzieNV=|9?4FfZ?=`S^=}=quFMw*CY5?|r2|ozBOdlhdI$9}&At2G6&)IXWR` zaV>*r_AHB2vHn2h{xAQ#zL~%LQ3#(fH2(Y3XZz;L zIyxto4TtNv$A@w+#dm=JvZG*K70*}K70i=K|E(%}5Z|Q#CgZ&?u zRY7I*u)J#Y-yCl?vOCt^#rsP*>U3TB{eMu#B-Q#WgHgq^7^f!kzy1GBuKz9n)&GBU O2&t;2%xGB;|33jrx=_gg literal 0 HcmV?d00001 diff --git a/title.hgr b/title.hgr new file mode 100644 index 0000000000000000000000000000000000000000..331ceff4baf654545bf152b252de96f6f7db3f26 GIT binary patch literal 8192 zcmc&(T}&L;6+Vk8=7FkMs#Kz=(LPmbpOB)yw2?AVls8vurAF?Hm9Xc z-Nn1c7f1=bn4c{rk>2_X4nelI|w5E32YU0XOiziR~+R&K4tDN|m(bKSFH)ltB0> z`<(i$&HKQ8*~%?)gh)zH%moUcEPr*NShN0SdI83u8Nk!g>BnzJf@`nX0<;|I= zm$F8tJ;w~e$@0qL*L-XAIJXCQ?z|RX^cA_Ay+<~y{3dm>no`BNLEIn};8wzpI`K{H z(Ao@f@wD8t-vzt^a1<(Oa?isL+R`}XUB78K)Nlp*!Q*4$vekY${$X4ASID?1_PITu)Y0r{W;ti~pPb)n zAMxLuMZ`A;5&up8#@i3B0_Xeg`i1XoSUXNDNA>pF~V<|#xWEP^Yrm| zNt(DQMg%RSrJ~ag^d8*X0;gYpp%dIs>Z`&}>WAesFAw7aT8Y1KxMBa&DRk~`V64>z zPHIw|6j;C=ILf)GQY97rCFLC{rnsN|=*@cx90LQ4tHMzycEoT&Nm7-fab5Hw{GdNH z9@^PWK#Yt7R9a(N-n^o>P6&$$edICO_2G~oKE3xrzN+N69RExn|3Rnm*A2Az2eTD*1qQn*=0F!N#f+n_z+^8z45=E%ciQJ2XKTkWCz&g%sEV058pr5YF@c+Lr%5?h zv588Lo>FCP2Dd$r^WeTrS*cAlY*D2E8$#9gG@?l$Vg@8-{{ciOpv*367ExRLcR0nr ziyr?bM2vjj0?>_Tm$Fl*(FeVVUTAas*^ceupK&AnDYME63wQ!(39X8m(K#b;ci6fQ z$@m-14lqqNcmDB^e8egKp^xT%0MfB8Q5U_Db-LpLK|hIpkdmX9HJ!S3OzG}CcN8Af)l}g#Q{VQTgSLL_ zi_GYS!^^m@k(k`C-A^dedV~0X>9IUuSO4GV$y{7BqHnqY*U3!|0Xt4B_iy*nm3n5y z#idpBfjAA9`$4c>t7fyKc>ZPz@$VIK9(P3UO{DfN$pL;r98dNf#u*6v{BYGcVUaJ# zezXK_Xf%RL$(nAn;gbpV0~n6 z?TDWex>|KH5bGX&ci+8~ok)&H?0d~1<^X{B_h2H>i}w*u?JKypti5hsm}*mFY-};5 zrt}m=sI+Mvet5dz1nm8UW68rjEUhjruMB>$?wEbI?Uu!#%hq z%{28eyYI;DP+wQmF4xrzj|@*Av~{i{c>0g8CIDQR|G^cCW+CueHTF?K6q2*b|A8>} z>EdG%&z(rS0+gNd934|`Jvs7wl3m*q-yK(_xA)*WDYza`Y2E$kKh1Ugdoc**&fkvl zPww9+ZcP!@s}Ww6B4XAEy783S21CZTEgdb#f8qYG*Qx)(_=iKYCGM9$IBbZ(cO5bZ zS5NUM^IN?sA3Al#qB76WLpNfY$i~u=wiJz1K!Wp+_$P4pb`bnC z*a1J{|0RmjBAY*gJ3E)oRM6(XOGf+hWQ_B3@#q`HhMT^ zlUjc@ef33B8Pj!<0tcmYn;aBK;rHt_m6uc<$h5L3;bwSnn$JcsW=xQV1 zT}qHUFkGqt4}#qZWCQ+l_urU`(sh>BFbtl*teDD)%&$xexR+AwFB(RB72KuogL2X8 ztIP4Jj>{=Ha^QDj07-fZ#RWUm_7tisk zH@jC?av~M4m9_rgeUKZVC0+gtfE(Z##ZNv@cNCbq`W{^YuZilkPOkrW2!$az(Px$2 zfd4%HoZ_F13;%5Cx~#QDAY7?n{Qn4il`cGA{@N;8cK`OV8O-G$PVtW;qyASzi#?XI z82@!6Ypmw-Z|1L|PD=;M@EKM z!5@471GAWUYcW>fuH0~T|NiKmD)@TWOT930M{dNYt&@9YWfw8Ck@&2UO{f^t1L*(w yjkSgE>qBW-ZDlbB#ak#!AIqCQDF38?rBp*r^c+F~25+FZPVSwYKIqo+HU9zaJZ5hI literal 0 HcmV?d00001