From e9ff60210e08f7acbdec0b7bc396ce1bfe71ae2a Mon Sep 17 00:00:00 2001 From: Pecusx Date: Mon, 23 Jan 2023 08:49:58 +0100 Subject: [PATCH] Revert "minor fixes" This reverts commit b7560ab6d9462776aecac05d8bc6b42864281983. --- artwork/Scorch50.asm | 2 +- lib/5200MACRO.ASM | 9 +-------- scorch.asm | 2 +- scorch.bin | Bin 32768 -> 32768 bytes 4 files changed, 3 insertions(+), 10 deletions(-) diff --git a/artwork/Scorch50.asm b/artwork/Scorch50.asm index 216e32b..fd231d5 100644 --- a/artwork/Scorch50.asm +++ b/artwork/Scorch50.asm @@ -760,7 +760,7 @@ quit ini main ; --- - ;opt l- ; this stops the listing + opt l- .MACRO SPRITES missiles diff --git a/lib/5200MACRO.ASM b/lib/5200MACRO.ASM index a82cfd9..1bfddf2 100644 --- a/lib/5200MACRO.ASM +++ b/lib/5200MACRO.ASM @@ -74,14 +74,7 @@ .ENDM ;------------------------------------- - .macro wait - bit VCOUNT - bmi *-3 - bit VCOUNT - bpl *-3 - .endm -;------------------------------------- - .MACRO WAITer + .MACRO WAIT ; WAIT ; waits one frame (1/50 s(PAL) or 1/60s(NTSC)) ?ze LDA VCOUNT diff --git a/scorch.asm b/scorch.asm index 62b3532..efe486a 100644 --- a/scorch.asm +++ b/scorch.asm @@ -182,7 +182,7 @@ FirstZpageVariable = $59 _atari = $fd ; not used in 5200 _none = $0f - .ende + .ende */ .ELSE icl 'lib/ATARISYS.ASM' icl 'lib/MACRO.ASM' diff --git a/scorch.bin b/scorch.bin index b941430172153dc20ccfbd160c3cc31cfee96213..07e81050707bef5e570686da06c8e1cde2b810c3 100644 GIT binary patch delta 7000 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�#zy#q7aL$LNvk&G zHeaCoQE-1E<*|_->B$Z5$c>zg4S=ZM5gQ%uwgxf+NOB+;&M53sx1m1Cj?*B-VJi7t z;u{z5c{|yBgtgrzli~)2?1M0v24T<%VNi=VK+MaxFLSsF275XwiQ`7-*N9Hj+bU6O zDpv8XSaU$tq(8fdZM&9gI;67gVI}`4zSkRW9_5gyae;7q0^`TOmbVtj%W%F$;b9n* zU#@;c!)qV1Iv&XZZ*Tk%`uaG2e)OXpFeI>{@1IivZ?TrfvH}{*zIqnR$grVPBEZ}0 zd64vZEUfB{g?yv6ylpS39$Lc;Bhd-N8J;Xn7{I(sj0r=TZgM+K%2?>VZ(=hwnZm=aH|4m3Lo~!a27Dp38!zZ$Gp%A;|v&Ee_?T^^&v|q$)AU5 zdY7#KwrC=9Zh8tMOFd#=1^ob3!oq8lEkB5(s8npp@VawSmsi5q|0rsUQ ziCt3L|qZw+0@vjFN6ACO0N~Tdm1oFKj@GMt&oxp>a=1vTIsWH{avu zVh$r0*hK+`l4x$OS)GvC9N>PJuW{ASCk>Syf;S2j3!@?$&mkk3o(uhBa6mHvG-FTaoY}3m?o>K zAiKvF`A`_|lFM(LhPh7?#sxDKtx4miL7hY@$6sdZNcMzym7&;%SzG~@jhj#%IXq!% z-`W&>Mrg7xt#TJX(A{ckvDK2FCJbf5MTHf9+! zjUgpxO4>{AY`e4VQt9Q=Z%Yl^w{E{t`eW(CQe~NcS#X)AEV?Xad&2gS+fCb7ZU150 zD)M0BKqj69PYU()HKO50+FMIjPa5cxS%b6~YEg8J z)K8kh_>=D^Ma^AV1IWG}bg8djy2M&9fdz90(q|fqjou2m#R-Rx_!>Oj#0ZHH1XnW{TML-m z!?${`@WZ#rvT4DT->hB0*-TL(*QH+*T#MiWa`Q>eGpi^&6eRYA< zm4E_YUeKh^#riH#MFy5mLfVY%*|sH44v7;FjwNVDqBoV)5sQ8;BCBW24E(i7I88$Z z&JaGJAp~bhwiHk7Gd=(nY@3;7gq{ktS)i#fE;*`3tw8VWZqf^(%`xuI__`Q3=Y+Z# zIf(AP+sfXtKZUPP%Iy!Omk<_nj`|en#6UIBMLP^UbY{F<<1@V7)8UP-<)h+sjw^>m zeh3U8VWI^yO-+C=^onj9^W)C5z}C1=YAu1)Ug1{kwwD2m*DCDg@S0y?$MA~Y9W%); zcc$3AU@*8sDpt=_NQJ4sLMl^N?v@H!@7;DkK$*GQu7cO1-P}KR2|+Qeopt)s^2n`C zo5q!vLj|DVR_+$vpW*}DKgi9*A({_&*^I2YfVCB|=Cv#b!?oaxec-$5&rb?i&Pftx z#TY-_1w_m`nCp?I6o7cOfYn}ww{QR|6eut3K_?NMCpAzJMQ^yeIDm%Rr%sA1egK^j z`hGDFle!)^0NdTFUPk#Xa$|ws6BoS?PD;qK-=YWUFr|0$WfamUDVR}`xTNrr%39|Q zs1Tpd(I`zC=;1(;4qAtCq|y|rgoKw02)e=t(Bp+tp`_rZ5@S+-CV|u@<$>Q}X1}G{ zum^B%>BKabXEn~w1-D_G9YR3u@+XyK8JFsPZe1KwYZWMue8R;tq2%w}FeZ}(&58G& zW)iMD6kw^`Yh?bMKslIf{QPhVAbaNo2Xxnp-S?R7K{@iwb*O#O-{?CR1bH=B|co z_D8s8e}Zc!!=FMjSvhZb_~WAE;dI%~ci66)IpemMV> zVb;@X1CKIl(I<6CRnIr+D?3=4M*h&jIwPU6=?p{X_o30mvLHIx^q&Xc&sz&tgK`6AlSJ7@%GfJ28p{rK5 zyAYg`G~r|I&85-{IUn*2i_!~%+lE3&!NSOX5E5x@2A6LJcWMuCX#OE?BrOYrms6Ig zqfqi+&O!Ev&PecFlU{hL8_@W2@^%mB0LhE&-OrsPy$-{(nL3N_h~zA!383vXLTcMM z*Cjg9B!@C%$;4#ZgiTA~iK$s^fZIo%DtI~Q(tiFfM+nr*r^Vkvy}89zq=RP4 zbi$DyB~+)d3y{(xv;B?*A>1LAv)5HYI^7^~=^&2eH-LV>l-K}y0e4}4mzr)>)$3s7 zBspcuTwvzPC7)PX%2~<{xsrD!3a%Nr*TNBdU#9|81u{Vz0d-ZAJ`mXDLEa0@^PmcW zBmiPIxtUT9cE2{2MEtA9WM+A&`kdYnu-v8g5Z?@WkgI1zA{IrvudPjNTSK@-5kmoJ zpv|m&eqU{C?X)_#`uO^-_4fL$wQ!8!;2zmkCx4E4(%j}+QoksYSxe3?8VyO%gGGyc z^k(#a9lBD7Mv;`oLq{B}!J?x?C`Nulh7yRqs0qYsj08O{SEBw=M*h&XsuZ|3V}mtgm{8VTYp}nVBAX& zqK5~`ztUpW_YUZU%RTO}HFsP{fx4xGphjJ>G{*hd0XjA7YJm z4^lbY@lmKu8app@+2rX`%~Jn8aF9MNU0t>zhZ1cuhZ1?+q0@){dPr`Tn@7T*+{`!Q z{G_BLY^aL?qrRWgXc+UiRA(lacj!MSE~h$YHRiWLN7c|aoorne`+5KCWQu$%(c5y(&a}U-&g>H<`UI$kQyE m-wSR#-Kt-wV?11YA>#T8es#%~;ZRRoJZL+q^{4fI>i-9HLmB)4