From 87f7e7eafa998a61ee67c399377174c4fd2679e8 Mon Sep 17 00:00:00 2001 From: Pecusx Date: Fri, 16 Dec 2022 13:41:52 +0100 Subject: [PATCH] Dot does not fire MIRV :) --- scorch.bin | Bin 32768 -> 32768 bytes scorch.xex | Bin 49343 -> 49342 bytes weapons.asm | 15 ++++++++++----- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/scorch.bin b/scorch.bin index 95b04863e8b145a269f71f0de007d27cc32a5072..49f2d6db7738f223c6e10e91154635bbf0cce057 100644 GIT binary patch delta 1506 zcmZuw3rv$&6z=Tin)%+cv0HSQEZ&=(ob#RUoO{o` z=NJrpgMn|)5Q9{dDUJgIR4Y!GO*WHZdGPFvq+3`X-9&_rOU`Sj00GZ%H^k=%Fu_@6 zEFX+>neay-B+QV9>ZEi4zUTUuy}<{^(3RvXAPRM)L}7U;WgAeUl+*=)Mir@p0ZJ3gqwHjg zf%T#~SzpQymE6)aIq*@M$UAkc%nhK*6+3~FyRia*Wf*qUvGd&Uj21GhCBM+p>RCUW z=_Q`{!kY1+!1SxWJ#9?COLSyCdA00fliQ%ahbQt z&jOo_xU^qF%@P3_Yh?N{GuG(V(eBkzo(aaGFqhltUA+W|(Vf*AKy%4?p1}W@scYIO zlbn!A?%fuR^1FCORK6zCYr^CVl;DV4sAIF*D;2Ak2^{7BG@KF<#a z3dH4?`uu=9i(+BZR#t%m)hlr!HXZ(lPG=l3BpsFi%BCTmI(uPJE4d#rK@r3d;hJ;Q z(N{wDASM{U&Wr<-U3-yVffPMZ2LNG9LGoKGTUi1A(Jopeg-i6%TZb!v#x}A7&14Kh z`T_)6kVoN0kb|lU=LwIQpb<3`%5bCE3L9_(DvOZkx28rbp@rjUxF}T=Z_aWoMZU!m zq2=a1X0hd}<*6m(Fgl!JKJNY7kg)0bkgxr5#6L$JFNkHu3J{MzEsh6I(W&BM?>HK6 zv%n)3JS6iq(XksW)EFDpxKql4#$8hOY~yYz%Wtfe+H^1_AI8zzkM+Cu9cXFq@()%- zzL&Hz2U4g;Q{stpT(gi;3$knE{xb&4gBK1T93Wt3JB&kfOOzqG^pJ;Lgh%!OzWi%A zr6tPf*KpR)<~bsS@ify->j;LS^#si2`bq>qnA?E|yT3GwIMbfMjNKRE3PjX)j6E+6 z2Tzc^EJC=w9h-S&QABP>ATze<6=i=}xL#U*h4-Ml9H#<9b!%mPkP7`D{9)l zI)8I={-T(o4SUVUzZ<)L$MyKx--3`#Qmxrkcd+$K=fLH=B8ehBe`~FwuA%Yd_1^7PMwadjcGPm4tJ?hj1=Zhw7XSbN delta 1524 zcmZuw4NOy46z=U0zm`|9Dxk&NB0&TxI7GzoCyIa%VL*ifYR3rMv}#uT0Vflu4;`@u zxwI5$8%KCepBq|v*^rE)Gf1q$#+D&5A#O1`aC4+v)WMd>ZqZ?~?cL<$obP=1+;iXg zZe1O>u8wQpDg>!0L%1IB(Q#qAWa>N_wgWomt)-dan45@IcSYA#(|~~e?1bH`Yds>E~vzGr(kE#ZQ0G?Fv|)}oH&C~R*f9|kcfIVA*G(5{rB#W4nkL)ppX zI>wu_Fn*LB#<20JQs5h7ARnG)ByIqer`3QMb|MXcO&IPw%`A1p^WMq@FX^S1TF?07 zO0V#ZFQfS!3QYgn&!(pbT!IS~kejQ*M?Fn11i0<2t@pSfn+?sp1;99Zk|o18BC?+Y zsWgG^ee?s>OJ9A=p{~+>*!GDQS=EjP!s#)}BL~qMau0|@4P-c&L_K6ISdAW%rvlIE z@U$(|4%1>0zn@ zA3OkUC^s*WPd1Vy(&p^}B>QWgCs-_RzI|IX3x^9jtGjM83Tg<-k!QX%-eQ1>M^%oq ziztobO(9ivMUypmUZa9ht+3t*?-^BAwQi8;;nj|9!AAwL|1 zqMrN`-!UvLih)gsm{7E=U~@pX!K%iCusGHePVuPpXC@8pE69=*wU7;n4vHY0gv-;` z*Q+FLhz`cTXg=|6!CD|da|KB&(pwlFo@A%FSPbJd&_|6MhmCr2H<~XLgx)Vi03m_m zo#os044^K;>O;7Ji||YV-RTT)@nE+BHli~M3054fIE$4Sy%TxeGH6YN3XUV^&J;mH zYi8dDBrJ+pwX5~RRzKr6#u;NqTT5F;Yq!rYPJYv@)6f1a;)Sj6C9$MP1`<$h(FQPs zJ})Zri8sR|M)-*lzm}!N(Qi~5sWB!>TO($G_L!LI*M1;oxZ2}ls~RTf!+5i5ujbfC z4bAPH0l~7!b%~p^VLduptn|V)?itA?Ms&GY8ZaL)9C)Mc+#mtBwZnMitCWY4W~YZ8 z>%rWBoBuDzoIrOyUWfdZ!Kg+_ME?)FVxi&%K1?vvU1l{w(`F3;N%jjR5Aewj{MH>M zQAB@x0zLLvfbSxpj$mx2Bpm#KU}*&ZXgdybN}~v}Baj|@?=|IYX}JHH4tEa%s>{wD zqKC$?zOR=?#y;!FbUf|IRPju;rY_S6UK}&WJYrJWsH*JjY)WH{z#^zobZIu0?{t-u zacD)^!PF2F!>6j^;; zU`noXf0MQM&XlJtad(a3v#;(?1xCacRn{3VeRp@_(QnUZU-03!oI>SZN~`~L;O6j8 z9{!c?mzg;N19|__$(Io%gQahp1qfN jpaNaq-{MusP`}eNK?=0}K#=FVjM)<0SIh1@p!fe9*Pn)3 diff --git a/scorch.xex b/scorch.xex index 604f17a5dba2c68e592d6c4732c70c339752a49f..26c0d2bb1c0a9511eadfab65264a9265d8431c39 100644 GIT binary patch delta 1499 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 diff --git a/weapons.asm b/weapons.asm index d216af9..cf201d4 100644 --- a/weapons.asm +++ b/weapons.asm @@ -1751,10 +1751,13 @@ Loopi bpl StillUp ; where we know that the bullet starts to fall down ; we check if it is MIRV and if so, jump to MIRV routine + bit TestFlightFlag + bmi NoTestForMIRV ldx TankNr lda ActiveWeapon,x cmp #ind_MIRV___________ ; MIRV jeq MIRVdownLoop +NoTestForMIRV NoGravity StillUp @@ -2102,11 +2105,13 @@ MIRVcopyParameters ldx #$FF ; it will turn 0 in a moment anyway stx MirvMissileCounter mrLoopi - inc:lda MirvMissileCounter - cmp #5 - sne:mva #0 MirvMissileCounter - - ldx MirvMissileCounter + ldx MirvMissileCounter + inx + cpx #5 + bne @+ + ldx #0 +@ stx MirvMissileCounter + ; Y changes only for bullet number 0 ; because rest of the bullets have the same Y (height)