From 9ec78928f1c644bc6b6e86007db590b8fc6fe80a Mon Sep 17 00:00:00 2001 From: Pecusx Date: Sun, 15 Jan 2023 20:47:10 +0100 Subject: [PATCH] Minor optimization and new macro: waitRTC (not used yet) --- lib/5200MACRO.ASM | 6 ++++++ lib/MACRO.ASM | 6 ++++++ scorch.asm | 2 +- scorch.bin | Bin 32768 -> 32768 bytes scorch.xex | Bin 49272 -> 49269 bytes weapons.asm | 2 +- 6 files changed, 14 insertions(+), 2 deletions(-) diff --git a/lib/5200MACRO.ASM b/lib/5200MACRO.ASM index d8b05b1..2662deb 100644 --- a/lib/5200MACRO.ASM +++ b/lib/5200MACRO.ASM @@ -91,6 +91,12 @@ bcs ?WFRAME ?nowait .ENDM +;------------------------------------- + .macro waitRTC + lda RTCLOK+1 +?wa cmp RTCLOK+1 + beq ?wa + .endm ;------------------------------------- .macro negw ; negate the given word (0-a) diff --git a/lib/MACRO.ASM b/lib/MACRO.ASM index 4d9939c..5363554 100644 --- a/lib/MACRO.ASM +++ b/lib/MACRO.ASM @@ -90,6 +90,12 @@ bcs ?WFRAME ?nowait .ENDM +;------------------------------------- + .macro waitRTC + lda RTCLOK+2 +?wa cmp RTCLOK+2 + beq ?wa + .endm ;------------------------------------- .macro negw ; negate the given word (0-a) diff --git a/scorch.asm b/scorch.asm index f04f8c6..595f130 100644 --- a/scorch.asm +++ b/scorch.asm @@ -1897,7 +1897,7 @@ MakeDarkScreen and #%00000101 ; Start + Option sne:mva #$40 escFlag and #%00000001 ; START KEY - seq:wait + seq:wait ; or waitRTC ? rts .endp diff --git a/scorch.bin b/scorch.bin index fe011224283c56b2e2ca6e60ba201bd317696f86..f455b36566c45bae8ef6a027ca629e35de865279 100644 GIT binary patch delta 1686 zcmZux3s6%>6lL=PGeqGF1Vk9-V>)>JKuC|0WCXe|_d7@$C9 zB_xDL6-dgnLqT74N{3_|JD?AB#OWZ=j!dhy;y-l+Kh@GrYHO$Mdo%akz4z?hJNMq* zk`i7?39qx&9Yi3b`&=-FesEv@=I~)slMKJK%bHrofj&$GT@`h!AMgm+u7#$pBjE&0 zV3i)X2r$Hk`!hUnp8XyU0to8iBRve=u(^$KptPiT0~gxw%Y;z0PHFS8=t`g(#ITXm zw+TGMOw>v9F%!j(+GL?QjO~=U3vnb%2*U?@c5}GN1uSEU1xoCrXmGgLqB0&A>J&gh;X+=1%YNN%LUbRg}JCj13XI67F zthPm4(j4AI6&guW;hse$Cjl!um>i8|cXBCiw<2ZXq#>BKgC+4b zW(N_aHVZ}6yT%LDdgDcE13u0I^=N78d_jB-8IMX+*YV!(>vu5TX|=rTAF?v?>06^{_|>`*dnkesvGg>`<0}uZOS(n!^dJA3T84(`JDK zs5ngqypdbF7@bL5?AnWO2Gs^bb}=?vyjPRfl#i!~Hb)Vhcfa%w6N%L6Z~G~ako(Z9 zrZ~0P8lp$`hS(jw>7ig8Jx-6EHs=V#$79$`XL-Z^LVU?^s<5PvOhNWQVw9VKz(Mpp zW7E`ybqt^w=)DUkz`*4!(VAyb2^H+>ay?$TD#gc_blmQ@O& zyk6NAjCd+}P;&kD`ic58y4$*FJ*AJXZ+E%N2|j(sd327+e{bvhlbE6k1aefUiUzmQ zah1wNM#D`ySgV7NkZV>LP@(x*em*i>AvzH`rR^IFHz3e*U09pMfJp_ztfU?@`*#WUM=h!L44@@Oa@xK(5oIN}2e>fZe4s%oh<+QPd z-bNT(=?@4P%YKo~2ZC4werisx4k6kbVvGZ~h138eq;_H3{nausihOe9g3S$h8J`nE z#2S2!19`70`*UQTdkitg7QC&clh@nYJ3vBoDo48D8ou#rm*ahX=3fj-^G$zL02S1XPi&(g0VQ=p2JY zV{cLa13Ys!qZAuwzA`e7uZjLP8|q#o5!>jZ2WB_I<=@_iYa~<04S#uEUilqxM2L5f zvq5X!Cl#yI8w-oem`lTV#$O8Fki{l!+IgV;)VZ6FfoJ%l#CJZfZ|fd@I(b&gmP7Q( z%fpi-flAem^3T3Kcj@Z&TX!CgdB(&oOU&8*QCVZhY4hL{p7-3Pxdny0_ZGKY`bii# zk6fEqR&`5dWPB=4Kr0Hw RPT36IB88Z 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 delta 1710 zcmZuxYfw{16lOyL2!R_Bx?X=xHbH3ekzH|1>IcM)! zf#r(=%Z~4tgVW6IPwe{OeS!XmOnkci9Bh# z(L^#MoK%?7nd{q}1la9C=5b4KjnV9Bwgov%WZt^~{Kg#E@5uv$h{|V#_9ez{vjgow zo`6XxxgZE6q2hu>V2{2l@BuRPs=xzWLhc7UfsDC+&<)thbkf@-?Sbhs^z2YBrYH{g zW4W|21k2rp&X`zKSPLAkX>nk|u}#o3Q4VEH$Po#^d3<l3j{HrevcAtl%8q6dYE1^JrT(PeQPS*{%g&wX$n)y)>(+t&mGR z9o;Mb0F0t=<#^b*&U|+uf_5e;QwhOZ3|P}%R0+O#xP-t8IB9mFCsvAuWn$rE;?fkf zrG&y2=a=pVyHHl?2zZQA%QoV2c9;1BA$m|20uqpmDj0}RtV-r`QiT(^#t`M~o`SW`m0LHFJlDsxUAgxvSS%UDDC^B!!~YGm%>T7J%rIIs(hz)ras594KF6 zE37iPim(%?K$pw&za!brXc^fHSE0p7jE5%$IeR8m!B#z-(94@LR6Rt!#gU93 zdkC|)X#rvOfDF>0K)|4GG#9Ku(n?oNWwhOM{4U5A7?VYFsu;&XT~h|_g{vA)uucQw z$MjZotTNs!uTt8IUU$a2h3iT`n(E4=X___|Ke`BQl>4?y+LEN`dTN~$yszNK2+vTb zR$72?sB ID?{eTW9aq(txC4Ko-89hS{r)pR5o#?#I12^TCt_as{OBJ&D zNmoV@ayX8F{vAPTRa{pJiq%Ve4p%i+h3Uuip4B_6zpUO_)n+@$^2=Yc4jp5XS1nyr zM5OlyspynG0(hcP{aV{(3L5nAiXOl3#OisV6dkDcn3+t;cPMfWDK$0qj&9z8p^-81 zuoZPwueZkB3B7bN64iJ+PVQ+7I8t5OL%_@$n2eUy%=cALtW}2q|6NLOj{oIQ3ylqr zLQ#B;TU2OSu9LBGyG2=^6Ld*}|Kqsn@8HMyFqJYkP??0Wk=jc@1@m)_CEzP+@&D*q zZ4hy%W}$KDk$@bc1!NZ1g&6#S2U>5C@TnSnJYonU6tynKq3v%d7Y+W?+iJOV1Y|=8 zueY&x2+!|JgIH`|(v%^${i3hWG}{noax=uqC58q=pW!L~{3t)_DOyaqf(=MUeY|9u zf##F@xLN~TYocQeE;ID*8yLkS$0@~F8Ss~qwt7SK