From be54f94bf49dec4f952d67199a9a12696451f48f Mon Sep 17 00:00:00 2001 From: Pecusx Date: Thu, 29 Jun 2023 15:31:49 +0200 Subject: [PATCH] Tank name sometimes disappears in Lazy Darwin fixed --- artwork/talk.asm | 2 +- scorch.bin | Bin 32768 -> 32768 bytes scorch.xex | Bin 56648 -> 56649 bytes weapons.asm | 6 ++++-- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/artwork/talk.asm b/artwork/talk.asm index bf5c4bd..4ebf484 100644 --- a/artwork/talk.asm +++ b/artwork/talk.asm @@ -89,7 +89,7 @@ dta d"BIF!"^ dta d"BAM!"^ dta d"ZONK!"^ - dta d"I SHOULD'VE LISTENED TO MY MOTHER."^ + dta d"I SHOULD'VE LISTENED TO MY MOM."^ dta d"I WALK THROUGH THE VALLEY OF THE SHADOW..."^ dta d"WHAT WAS THAT NOISE?"^ dta d"MAMA SAID THERE'D BE DAYS LIKE THIS."^ diff --git a/scorch.bin b/scorch.bin index d45721047a49a2b0f9c3a4432dc062da3846c327..f35a5cdd75a6f1777eaf1e03fd7df9344c26401c 100644 GIT binary patch delta 1384 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 K?+Bye3iUr9XlUmE delta 1398 zcmZ8g4NOy46z28^3#?EWTPO-%NtvSHFA6s5jKs*g7d1np62;E3j8Ve`HEx0te=ZUS zQg^UF(pM39*sCp+KA;pWam!LIY_2h~XrfCrV$?0HTXdP3Kf6U2=ht`z{ zEf?puoIoiKGdH@+Z;U0C{!MYDs;BaU7so60*bBF8;#;Ia7z)SJc+!pYz{Y2zJP7h@ z5COGagS4>Bo`xK-+1|_Y#8Z!0jBY)^VtuQZ#pS2xskLU#afBuko=zp*A;mr>_!X%xAmF{z~7^(J8`6j>rU{N$XjxYZQQ3`aK4ow;ZL7PvlQ zH?DK7LKe8<%3<-T>mc&N{w^J}Y`AM5DuKf88E6bDyHk({j&^J1V@7Vw2*{lbx4Lx_ zmex4aVU_#ZRJ8>YD;KnO8jb~&ZBccGx{}`l%5a81PZ>_bmq6PyYtbd}$82Z}NVuGG znoW58%-m_vY?&L2pPj^i0gVbP@X$n7OHAwylmq)CE*o2@Wyhya~&=-amSmP4ib-}LjYpY(66G6!dS1tFYrQte9F^*FfmcNn2|rqcpp5ZxTg~)k*Y1V@(p3H112neQUW2_`QD` z8}USMAqqmVcfn-#>VTD#SR)z(RvN`RKGEeCTmcU6oXo@aV6kMmJh}x*4iSa$Vt0f z66gqwa_>R$;H*icq0^veGt)3Q`~AWeXFw?osigI)Yx>x;!^8fCe4#&=FVq+Cef&*c zZkOBh*(0~>9i&R9(~(MFl)9sG@#>A?5^g&@88j>@=BbSAiTHw;FA46)xR?*@361MJ z4H0k}182ShY4mGiS_FgE^QpNJx@z42wlemArxQ4nVMn@`NB@bfgz@ugv{F=DFh|RB rXJpP7TfeJRpb#XDG%GGr@~7~(`djE4QBS%?`BN#r2jZ2H>coEmpnQ7f diff --git a/weapons.asm b/weapons.asm index d80ade6..c00170e 100644 --- a/weapons.asm +++ b/weapons.asm @@ -1633,10 +1633,13 @@ ShotUnderGround mwa xtraj+1 xdraw ; but why not XHit and YHit !!!??? mwa ytraj+1 ydraw mva #$ff HitFlag - ;here we clear offensive text (after a shoot) + ;here we clear offensive text (after a shoot) - clear only if no test flight (Lazy Darvin) ClearOffensiveText + bit TestFlightFlag + bmi @+ ldy TankNr jmp DisplayOffensiveTextNr +@ ; rts .endp @@ -2453,7 +2456,6 @@ MIRValreadyAll mwa ycircle ydraw ; we must do it manually because of the VOID pointer - ;first clean the offensive text... ldy TankNr jsr DisplayOffensiveTextNr