From ffcf44cabb143b6a4645a60e903999ce2078c6ad Mon Sep 17 00:00:00 2001 From: Pecusx Date: Mon, 12 Dec 2022 14:11:09 +0100 Subject: [PATCH] Better Soildown after Hovercraft. --- scorch.bin | Bin 32768 -> 32768 bytes scorch.xex | Bin 49340 -> 49335 bytes weapons.asm | 37 ++++++++++++++++++------------------- 3 files changed, 18 insertions(+), 19 deletions(-) diff --git a/scorch.bin b/scorch.bin index 8ffb1ecc7d876316af1f57d17290061914d64b32..24d5a73b78a8457ca224e895fd2f058adeec5616 100644 GIT binary patch delta 1249 zcmZuw3rtg2815-8&y_0=r|qmgbZk(iJd_SZhKXOhvnlfgmHJfnMDM zwz1O}lrnVOhKpfT@8ZH-Wk!eTWJ{M(H$zym1Z9uJk+~AKWMijAF)Coe+u6Uvp^Pt;#fbJMw#MTP{^3X zCpl5s4)T&~(m^sm`)#W$n~6!_adB8&5*-96=2nU$9H^M)EI9z*F_-slW`l7wyYFkT z0}bXRVS6*@6p*5vToJIL!?`mtQZvmWoyuH29Y&7Ok)#t!nT)(R5Fs@y?;2>KpFs8b zr-77N$Om9Arav>#Py6Wr5^bP;>nQ&W9fdPJeW`=v( zG_JExku9!L9@%=a<-l5hiv~(8u*V8-qk^&~AV$uz#())|G*w~@95*|3xU>;hI^mA> zh<~N?(2;Th>QOx})wqL~pLMf5K}xkz`3|D^62eU^hm1{qQl+F3C3xh(q03$9j%rtk zC)+;q;bxg#bG*5u`|S?~&qoWyJ9lNhSPXm68|tbMti5ejMx!6q z;^+XTS#Wxw_c{R!2cZl_SEYy)c6YFoOS9~6;ToTy(Nv`*KS9&5k!OShGwjr;y@{YG z`>O<0Fs>>t;3#bH8k(t2BCZT(Qr=&AowR2>+iq zz~eO7RlM$cl#GM6*YN>|$*kjrbsg0;>-&tK&M&QUBBJAEit^U({wvqL57>k#r$l|? zJ?ipTOTlq_>e@{gzF1h=l9*a?w97K_t#^KL*|+*nkf>0pQfm#p#&Oq;TX(se#PYJ1 zPQBsHzKip}$E3bg-PC5ZP2VG=1xlUOd3E8Zzr$d*ed8M*MmHK$+2_uomBuvu$0Z*7 rfsLHnuuI234#KZx@}x0TMU#I}tNe1L(D6f#(e`1%R43DVcjE(EUQjkfaCB zb8?MFj?u{R92Wus>J~PEuh{FtF9~p$weMy)V4f|5KLBo=6^0|2A_{_8l$W9b)vP(C zof}=|rp|dkb5rbZLEGsqV`I~VJe-y+VM4(K`)!t605ojJ!BPNzVb2#l!T~J0Qg{^{ zKqE2ZLlzmCaB7T+q&!f{<`yS|2&skqwU5~yBv4C9 zH;}UPB>)s)`a&NQ7o^uw(l#pGKqYT6(YVqke{jQFk0EjCwa5vx>+=9_>RICmJ5;fZ=V> zCnwbi2Lh!iMj;Vb4Kbm3_7CU=(LV+24<#Uj!VG96s5=^^G&6uY1G@}(_h(?A9OcQA zIc`02)}6wmO6n2+n#E)%v~V8H)EDt&*7B)B6rs#WZL#)QMK-@})kY4F43pNgg5Q1I z_wM;3JlvQXr$@2^;*-hQE}kVSiGajq)=RQ@4l#rXCS< z(bOwqIHnUKw;mSMLK$jqhy{bFvq8njSvPHDq79vGNRC-|m=HKSJoq&Mt4FXhT$Qy) zLHoiyJSK!5!0rB5L+81iw{sAoNQCY;gJ8ctRd>0`0J*|6VbkcV#0JHO(^!;P!f4Z@-cyASi?M$z((=>OO%rrZF z_4}nraVDvLjT$hWwp>_P*_B_@VldLq*}L)5Lv>y6PtDxA6B?6IMsJ4Smu+#Mdy?AFdT~BYI9R-th`Uk0wk}Y^&ZJ{Wnr5 BBP9R; diff --git a/scorch.xex b/scorch.xex index d98b310200cc12ed32a9e9df8c74092775db386f..34efa544855d110c90bd769dc44f5a9546c6bf2f 100644 GIT binary patch delta 1338 zcmZuv3rv$&6z(l8kBa>AQtWu#G8hAy47LOrY+1pKhd*oy(+x4C1Ezos0s{pm1H>PY zH{8D4zch?ue}qx^_bQ=`#01l!t{TZ6xW$pp3E2qKpop37wlG{4&rR+<=R4my_uO;t zWP{U}4Nj(;$=rJkyO8{eGdPBtG9)07{XOGX0+8&boKY@_V^6*J9q|890gtNTcy57_ z)a6=Vu=y~NlwO$vF&>Ia^NxUF_EMgV=h;6a&&v^IB84hJ4we^e} zrDr@S6YOP~1`*iSD<=~vCcqA$xzp94mwmGlfOrh=qL`g_*r5e&X|HZ*x+caGXWGOS z8Ty;-dI~Sy~ft{TIaM+P9 zSAgH}MYkBFqP6aem_6My4}v%f*l|)~X?CY7EN^Y6D#t2PANN#9V3z_eDq#YeK*gX1 zbxMUuEF~RUqBkTIgC)2$z2#-X>SGIDVg}JosW>Xv>ar4Q71^9fi!R`rfRL&G1Gkf(x2ky5o6SkXmQfUky@6qVPUZtYd~ zdkKU0#JrN21{cu-RhBE}CaB0NC5l#yyc`C@fuZX53j`ciLk;RsM+J@1R%a8R;m~Js zkx${wtE2Wlg_FOPN6&*aZ5W`B69xlaM!+$4pN0>3V;UHS#M($gq}gYfTjW!744Arl&C2lKG$HI0B(fC3)odj$RYV>Exa~2OLkJY8v~4@?y1Pxy2Zy=Hjt&6C+)$?< zz%yLv$^eJaYS$E2f7(3{qQn$zKdE%LZXv7PIRRwNN7aY^?XFfr9R-(l@Bnh5QqYY$ zG~p;iL#!c1kgW{&WpO_(@knQ47FY+mrpb_(dwiE-J<&4);&TnLfQD-M@e+?@$=5!r zK2C@=LoNIb7YVaw)Xr5^jVYOZ$*on<(QntN>5nN53R}Sb$5-Y8`yO z7Lh&0L1S7LkOT0mYP|XZ_6Us5fgsfqf z2a^oy2?-oAKr3o7B*(gFkB?Kt^62+*kB@5TG{$;Uj?Njv_sH8%Ng1Yu*IqA$zrP6o zC$MlcxkU(VG-IXTk}wQiA%QL~*(d@+mk~aN(oBhx1Y;UAcT+^pu_Ce-b5*7|@CGuP z;)TB$@bgP7aT&KVb0rTX0y-{u1&3L2nAORjWG3eb8l}@a!U{~8?tD|Gvcj}z3Zc{S zDZ?inou*}=4^edaF|~;ml6Bq<1H560a|NnRlXWwC2DRjA7>16ACBIY8Vnd*$cbcLh&oxNS8p`aH% zXHS*(TQ`i^FdL_}pX75vgOvjOsm^|=@f&B!WoA`2fubBT-|tx396q|pJ?p3q{tteS BOez2X diff --git a/weapons.asm b/weapons.asm index c1289c5..26e438e 100644 --- a/weapons.asm +++ b/weapons.asm @@ -2615,6 +2615,7 @@ ReachSky sta RangeRight+1 ; hide tanks and ... jsr SoilDown2 + jsr ClearScreenSoilRange ldx TankNr ; check keyboard/joy and move tank left/right - code copied from BeforeFire @@ -2713,11 +2714,7 @@ RightScreenEdge mva #sfx_dunno sfx_effect NoREdge mva #18 AngleTable,x - ; then draw tank on new position - jsr DrawTankNr - jsr DisplayStatus - jsr WaitOneFrame - jmp KeyboardAndJoyCheck + bne DrawFloatingTank ; then draw tank on new position pressedLeft lda ShieldEnergy,x @@ -2744,9 +2741,11 @@ LeftScreenEdge NoLEdge mva #162 AngleTable,x ; then draw tank on new position +DrawFloatingTank jsr DrawTankNr jsr DisplayStatus jsr WaitOneFrame + jsr CalculateSoildown jmp KeyboardAndJoyCheck pressedSpace @@ -2892,24 +2891,24 @@ OnGround jsr WaitForKeyRelease ; and Soildown at the end (for correct mountaintable) ; calculate range - sec - lda XtankstableL,x - sbc #2 - sta RangeLeft - lda XtankstableH,x - sbc #0 - sta RangeLeft+1 - clc - lda XtankstableL,x - adc #10 - sta RangeRight - lda XtankstableH,x - adc #0 - sta RangeRight+1 + jsr CalculateSoildown ; hide tanks and ... jsr SoilDown2 ldx TankNr rts + +CalculateSoildown + ldx TankNr + clc + lda XtankstableL,x + adc #4 + sta xdraw + lda XtankstableH,x + adc #0 + sta xdraw+1 + mva #$04 ExplosionRadius + jsr CalculateExplosionRange + rts .endp ; -------------------------------------------------