From 22a03595367c0e7617955f123011528bf9e80d1f Mon Sep 17 00:00:00 2001 From: John Bintz Date: Fri, 14 Jun 2024 09:16:01 -0400 Subject: [PATCH] some text stuff, pending cleanup --- bun.c | 20 ++++---------------- images.s | 3 +-- main | Bin 59980 -> 61032 bytes main.c | 34 +++++++++++++++++++++++++++------- 4 files changed, 32 insertions(+), 25 deletions(-) diff --git a/bun.c b/bun.c index 20ed093..52b05e6 100644 --- a/bun.c +++ b/bun.c @@ -39,9 +39,7 @@ #define BUN_WAVE_LENGTH (FRAMES_FOR_SCREEN / 2) // linked as raw bytes in assembler -extern unsigned char far coolbun[]; - -unsigned char *coolbunArea = 0; +extern unsigned char chip coolbun[]; #define BLTCON0( \ minterm, aChan, bChan, cChan, dChan, shift \ @@ -51,19 +49,9 @@ unsigned char *coolbunArea = 0; extern struct Custom far custom; void setupBun(void) { - unsigned char *currentCoolBunArea, *currentCoolBun; - - coolbunArea = AllocMem(COOL_BUN_MEMORY_SIZE, MEMF_CHIP | MEMF_CLEAR); - currentCoolBunArea = coolbunArea; - currentCoolBun = coolbun; - - CopyMem(coolbun, coolbunArea, COOL_BUN_MEMORY_SIZE); } void teardownBun(void) { - if (coolbunArea) { - FreeMem(coolbunArea, COOL_BUN_MEMORY_SIZE); - } } #define BLITTER_ASCENDING (0) @@ -361,9 +349,9 @@ void precalculeBunRenderInfo(void) { int plane; for (plane = 0; plane < 2; ++plane) { - coolbunPlaneStarts[BUN_OFF_LEFT_SIDE][plane] = coolbunArea + plane * COOL_BUN_PLANE_SIZE; - coolbunPlaneStarts[BUN_ANYWHERE][plane] = coolbunArea + plane * COOL_BUN_PLANE_SIZE; - coolbunPlaneStarts[BUN_OFF_RIGHT_SIDE][plane] = coolbunArea + 2 + + coolbunPlaneStarts[BUN_OFF_LEFT_SIDE][plane] = coolbun + plane * COOL_BUN_PLANE_SIZE; + coolbunPlaneStarts[BUN_ANYWHERE][plane] = coolbun + plane * COOL_BUN_PLANE_SIZE; + coolbunPlaneStarts[BUN_OFF_RIGHT_SIDE][plane] = coolbun + 2 + COOL_BUN_LAST_ROW_BYTES + plane * COOL_BUN_PLANE_SIZE; } diff --git a/images.s b/images.s index ffbad83..a9be48c 100644 --- a/images.s +++ b/images.s @@ -5,12 +5,11 @@ XDEF _SpriteData XDEF _MaskBitplane + SECTION Topaz,Data_C _coolbun: INCBIN "images/bun small.raw" CNOP 0,4 - - SECTION Topaz,Data_C _TopazBitplanes: INCBIN "topaz-bitplane" diff --git a/main b/main index 922be805d781993a40bbdefc192d2630245804bc..660f09c3c83bad9c186cf2c6aec267100acdfd35 100755 GIT binary patch delta 6036 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 At^fc4 delta 4846 zcmZ8l4{TFMn*ZM9#c_<2XM&p=)+8@4CW#$mn~-f&HpjjMN?l`|H00P6A+XuR4y;SO zY2Z>ROB@!_EX$&_gSrui5O)_2ZFKh2rEk~8$=3vcP<86uKObv%f2{z61c05keu5EZ-? zys`g*E9j!<{|+j7dr5u{JtlXPS`VI7lvTXVNcau`@jxg(MomKrx-PkA{X>V1% zbi|Z~SlX?#TCE;4NRc!1YeMM+u_Dj{58o9aZYG60&&TII1+KNaKpM)W*zlQ>r~m^ribJG^~Vqoun2j z`qaSoG}EzMo!NO@(ipSx!_xYGrP)s|UG!Ebq8aZEaH$_od^^@#MD)lSKon$VhP8jUPQRdAq(;}8_Y(@4Z znOF5H>l3o7NBW1LXqjNnG8TnKnImBpdxy9xM0_FD%W4x=Ey)6c6HD@iu;YX(7OZ)d za6-`D%)aZ>u-wR*2Zy3Xf&y84!VFoPkV9+6yPaxjc)EXoWG|m&h0B$?4yrH(Z{*4K z^~&Xdmu*->^0Q>$C|u9~#;RR!=rnz&x%>k>!)o63G?o`pQ)X%&ES~@^D8_t4&g%YP z%d1hE?+Z_>Gm*WjGBgeiwPSEs2d!v6d5>Jd8&B5;lVpjJIvnh!oM5j+fDY@{$B22+ zhBN(~;}846E^3aEwJ}D8wH`f2(k`_25Nc8kC#h-4jeM&j|YqKsr~UH{GVX zXR(QT^7j#K;9Rbh_VNFed!;b1&HY*bXj@YsJ)8w1pJS%l7%eiPt@E4En~Tx?bVm2X zbx}A*6o+axMYd~`bX(_Vap-a)Qvr8yxcvt@6*f18r>m|B2P|;M{RN&bGN&l;L@2$RZBKum?k31GNO~4@sC;eS zGL!I@rt?%K)zghC}tNBi2m8Ai2tdl1BTFYmQP4VN_ zYQAYvRo+lbE`qj~&*a+;zU9Zjr}1-(mP@t#<3+z^YzDj=OI7e4fcx&jeYS<^?V0JF z6NdjnR@*kRIgQ3ricWf$oCdy?4mJj+|ni z!ZgN_>^#nlCg^r%wd`KdqQmAp`GvwKUrc$WROyK{xV)hK7V`OJ|65Vtx_+et`bsd4 zXZL_uHh-qcUk$u|@S_30PF`qrLguJn@?&mupt%X$wVBxqu5q98q;loqj77+e{7K%b z)ELHEdXgVeRF>o5XOxVamTu)!$`ewQf3B$g>}J^^Goh-yAD*U*k-fi}716oW>d)Ix zDRv>9^oe?;<=q}olN9*o3tMmoGSZ;p=HunDjfG>Hi;aU5Sz8G zE^<_KksS$Q^Zc?pL~@M&wi8jd!T-HQF?w(}cDM~0Cw4=r{E#0sAr4Bl8R`~2j9R;QXLDns#*PwJzTbv&KiDpo!8>KCY_*!ic6ef@=P zfA}xWbYtKT@A>onX8#j@@*_9ru8DMLITSsGM3e)zpx&qlb&akMq@;#fsx3=9P*Bv# zhlVM>8Kb`<^NmDwq+*XMK=FtEf`>_1X#-cvql>~sk>)0~z>~Klqk<0>X^mn7#RoDK zBiLJM6ZQ13CCyD9FlB4jY3T04>0;ZQPRN_nadWB+2WD&3l+r}YXN$Hm#lb^MmbEJg zpZTPhaOgP`78L=v^e9ejXXsGE9G;~dB@i_sIC98^w1=^^qam z9ORVUs;8(8iJ#>NgTtKRI6JZAmW3(Fv*$`q=6Yx_>Iiw2ZE-pDYTTkFX;6J3GUTJS zQS>kh4aH}c_K~D)<7t!@O^W!>)8jhN4Ag6EU3PE6FU* zZGL*i`VvEu=wov=s$*Wv-2RqJNy+;g)udDc=@C3%#3S(onm^vK+U z6cNgZEQ-M&mkEz$jfn)qqEdXDJ04I{(c=h-RDx)tB`vNh*VElnumLMugN^j!8fTAD z?mZ1cxPkTZZ`>m_N-Ay=*D+kUKyn9_9+aDt;pt9_Qf`gE&`?;6+fi@A){@3esFzQ8 zO2q1KdfF;7)~hhJ{JeCWES;4Nx2aOgbs7E;c1=k*n0k1;x+F+FV)pyz1&cc<(Ra38 zk8R(5c2+V!H!C^4n{b^P*{mn58DT@};PqD<=H`pR*Ul%ach)Gu(7;bj?~Ky1mn^A# z;U!!dHBXX;qw?kf&p(C+x@5H=eiyK09TN3=oYeF0ze{MLQR+c@$=)4NdY~hGdm2IE zZ+eqfB^oa@LZ(=0JzKI;mQ;%FvHr(fWR9;1y+xF$g*~FG{thmx?p;KP;YME_Lwff4 zoXfyVG*$r)xZt$5ZVYmJYH*)yeTbUH#xBQnG65@QIk-;Dj0-YvmH*Aw!*Z}CswsErI|Zxl10kF%*^+%!gzzg5q`YJ<4}$y?3$i=^=h>%Lk4d|w6JTfu`Y_c6w5Y(!DYQdq$IzZafR3R* z`X_)n~eYS2V!4Z zFtjv&Z}TrwemMBk)du1Ilw>o+6PxqwV2h4 zj}NkU*dSTUFMMC?myqpLKv@lGn__fp4x>k`psoWm=$~neT=lqQ-pa1_GuUug z-58^9XE5<_ys%-8u4wb!a}&a5}u!QGq)~%j2^!4r2paHK2^n(i(GxWxWDEyDrznu5y=b| z_yo9uEA~xb9Q1qu^r8(!dB=gHV8@4X?tb7ja1i)c;0^GZ02$xOPXRhm0@y(lumCv# z=34wA^lSy9RB9*}g1IMv!(hNK=Np}Jz9f8spPi};z0IW3f17$*T8HyS^NIscMo-uJ z(CHK#7vH1zuZE`?m0uJuGdwV5pI0xxC9EQc(N>`4JN{h$yxgjm`U!{V^c}**(Mfum zRtw23kI_pO=xvYDZ3}e%-+%6qWWMT}zd>%LH&*ra&(rZ$SfRWHtr(p!Mr~-t=%g{) zN+-(%Pcx;(O68y?o@f8%S}uEDvcVHBpbpT1b^sfdjsc@ERuRw$Gy~g#B+vtZhaG?= z;6`C)#&3UKx}63DK}t)iq`%zJ)3a+&LfxD4s=L(A*uIWEl|AZ@yJIhRcC`C^zE?VW ze8NZH{gqD=t-6OV)NL86Yn;ec3%>-2YU=s1uY8Q^`K7OZ(2vNVk@4?gt88koS>5*K%_G@dugug2!I|OHetH33o4QK^mMG6D!0Uf9ZL^5Ct(golIAht6B z3> 6) != 3) break;