From 3f4c941f6f7a585727be59400aefc4132036d7df Mon Sep 17 00:00:00 2001 From: Pecusx Date: Mon, 29 May 2023 14:50:50 +0200 Subject: [PATCH] New weapon (Punch) and optimization --- game.asm | 17 ++++--- scorch.asm | 4 +- scorch.xex | Bin 56327 -> 56548 bytes weapons.asm | 132 +++++++++++++++++++++++++++++++++++++++++++++++++--- 4 files changed, 139 insertions(+), 14 deletions(-) diff --git a/game.asm b/game.asm index 5eefdbc..791656f 100644 --- a/game.asm +++ b/game.asm @@ -420,18 +420,23 @@ StandardShoot dec Energy,x ; lower energy to eventually let tanks commit suicide ShootNow - jsr Shoot - ;here we clear offensive text (after a shoot) - ldy TankNr - mva #$00 plot4x4color - jsr DisplayOffensiveTextNr + lda ActiveWeapon,x + cmp #ind_Buy_me ; BFG + beq WeponNoFlight ; but with explosion + cmp #ind_Baby_Sandhog ; Punch + beq WeponNoFlight ; but with explosion + + jsr Shoot ; bullet flight bit escFlag spl:rts ; keys Esc or O lda HitFlag ;0 if missed beq missed - + bne GoExplosion +WeponNoFlight + jsr NoShoot ; no bullet flight +GoExplosion jsr Explosion continueMainRoundLoopAfterSeppuku diff --git a/scorch.asm b/scorch.asm index 8afa173..f74befe 100644 --- a/scorch.asm +++ b/scorch.asm @@ -590,12 +590,12 @@ nokeys lda CONSOL and #%00000001 ; START KEY beq noShellDelay - ldx flyDelay + ldy flyDelay DelayLoop lda VCOUNT @ cmp VCOUNT beq @- - dex + dey bne DelayLoop noShellDelay rts diff --git a/scorch.xex b/scorch.xex index 13fcd791a1e462273e7c8103f92b1358c2dd1f11..e2b76905ce9c19a654bf6f3a481ad958ef410198 100644 GIT binary patch delta 8127 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