From d462c84577b96fd5d8825f9c7fec18dcb2244d52 Mon Sep 17 00:00:00 2001 From: Pecusx Date: Thu, 27 Oct 2022 20:33:54 +0200 Subject: [PATCH] Bouncy Castle bounces Funky Bomb bug fixed #129 --- scorch.xex | Bin 48609 -> 48619 bytes weapons.asm | 7 +++++++ 2 files changed, 7 insertions(+) diff --git a/scorch.xex b/scorch.xex index 4b629f0b5449a2762e44c15da7ec3ab26d37c616..468db2344dbd67fafe910dafeafa0e6b0c7bd40a 100644 GIT binary patch delta 1275 zcmZuveN01F_eKIV`W?4 zq6;l;Z@)_$GWx+&*cxAS7FUw7z=Tb}3~&ZBz-a>0VRh3m*%~kHGD-B^jao(Y}Fbz2s7#X^)ZPdx28lCe9NODMGN>xH3mb><+oqr;k@8r7YB?pbls6Sek^s+ zQ>*kcSuF=RU=np4^@B20pxT0Mohl1kr%DNi5Wj6WvD`$nsI%l%6&*`;(FxR9SkBC~ zNx`~u6WOe$C9436Ki&+=nUlu>*oNUUHJ!W)N4&I$UVhYDr07R+r3d(r(I}EbgD1uk z#*LnV5U;BS4wNbIQ7-i^fV;j;1-KxL`c6SS$=E3_8&sgH?fbw*^sHthNI+GZ&%xs; zUV9}j&`XT)COB} Y(z0iJHIqcAqX9Lx}gIOHL;S=Wm9_UJOe4Ek1=0>;rz-HW^# zEjgn_`}HD}uPLFJYj)83*^|)^VW1wkE*Q_Ecg+tLVy$BTgVIx`pPPOEE3QxIB0F3B;XDk zK6AZo%O+9hNQ|F{A80RbiQ8a{&{8G3qzG*!Nf)H1 z$Rc}+XG*ztQ#zLV3&+-+TXuQySG!!XVsCKh9DR6A;??I+^iYk(#l=*ERfaDvyVBjT zm0uM)KxQG>sZ=F9XfD-)^#lnp*)iNQaYx}jghQz;64Eizq~zaZ@EM{w0zRM!?_eZu zEls#uV=e8zeYhn`i;EIjX)ua00_SakD*J_PJF51!x&0TunVh*57D-+%c|+aqI)C}v z0)M^qx!tuYN-0yeOvgL|KyUX1d7`QNeWr0X~LYiAzxwrnL#&~Az zhb1DlKu*54Yfo!O_obg!64El|JL~Ni=a*R<$(r}|rZd6GQ0JNteds07DQ^;TdGmmq z`OaI;1I#Ubekm=FhD;*{1gamx8oadWHB=@JJF%+I~| Gg#Q5g_&Z|& delta 1234 zcmZuweN0nV6z7)L7E0wkp^BIRw~PgtI5H)3n+(u>l*zMdP&W66bPK2*Q(T-Mh_eQH zxS_3WZ|T=-4UxXe%OF&qi*{St=2jLfK{|)a_6HN#*cch&XpGK%U0UN<;=9Rt=lp)Z zcg{WM-ZynmGe7tuCVF~3TphK2CO*#HOXggsf|}_^N%)=c zk$Qv#!-8X*UIZdS?&~H=>V!vMp$Kf{^t9p^{9^V8CWI?Hip7{u*wr2nf&#ziuuS?7 zvy0oU<%EL9H{wAEojT$JFQ77AA+~#T1=zZETJSNF9_>$6wefLG4}DF?Co=7PGSdT9 z!i}R!kfds(8=CoyIRMF<8h}b@X#!w1hSkmd;yF0#Wj*koi+Pg_zYu4-kB`NoD2FZ` z8%z#bxV{;2dkySUYjCO4&6@$<^(^BjKm>KSLfpwccHxU%t23(-@^36Zp4|Dcs^g5mw^E^ zYkoCp79S4N2{*jM51=Zv9!wz*Qso{(bi29xpeUcbOwLF<{fe#hr{?Zv(NH`cr2?;z zQ8&esw^)hzcs!OA_a+7W<83%zhYQjN&_>IObZv|}^MA_BPa)Rw0XUCTZCbD!oof?t z-?dgp!cT4bi=+ldki=FduCkW5oaw zwki;ZCT$h+2&;h&Ht4p&yLMD&&jnhv)1HCH-(uHDF>%#KXQJQi*(p(K%noJVaCTAWu61Z?jy7+dy(2w}pfL zqy3D1CT-kV9vE|$Yi>E~*cP?}uMl1xh;pUlU+{64Rwrk9f@#FF0?AO$_BReiG~Rj~ zD)XZuFNu*E|B->^W_#zY@kH}Js)@(e~Wa<5UaOAHAY0K0#``-5kZ`^rg)#f*KF7Nf9Z!XFysd~$3 zadz~azwpVW5phyVTHf;&mD-%j6N zvi7x|$4_{K(1dH=Ltx*Hj(hPP^{xUP!l-wX7}TScU6zFEv&`?@opcSl+LbQdd)9q= MssBCUX4jw8zl{nclK=n! diff --git a/weapons.asm b/weapons.asm index ed08c2a..fd1e5f8 100644 --- a/weapons.asm +++ b/weapons.asm @@ -1897,6 +1897,13 @@ NoDefence lsrw Force ; Force = Force / 2 - because earlier we multiplied by 2 rts ; END !!! BouncyCastle + ; now in Y we have number of of the attacking player (TankNr) ! + lda ActiveWeapon,y + ; if Bouncy Castle bounced Funky Bomb - whole screen in range of soil down + cmp #ind_Funky_Bomb_____ + bne @+ + jsr SetFullScreenSoilRange +@ mva #sfx_shield_on sfx_effect ; now run defensive-aggressive weapon - Bouncy Castle (previously known as Auto Defence)! mva #1 Erase