From d5c1e1e397ba519108d96cda16e1f257495443d8 Mon Sep 17 00:00:00 2001
From: Pecusx <Pecus@poczta.fm>
Date: Tue, 28 Jun 2022 09:02:58 +0200
Subject: [PATCH] Battery activation bug

If you had a different defensive weapon, its energy was gone.
---
 scorch.xex   | Bin 40862 -> 40862 bytes
 textproc.asm |   6 ++++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/scorch.xex b/scorch.xex
index f02f07a053b95421b907b28e10755fa37b39dd30..97066979802ff0f0191619ce0d6cb8726ad67407 100644
GIT binary patch
delta 66
zcmbQYpK0EHrVXjl#)>BmE{NPcIQs(sO4(lb*((|59-KY5cJ>D;AidM28_3*yroMI4
W-b?kZn>TK<c*!_%)8-k`Y%Ty~T_S-1

delta 66
zcmbQYpK0EHrVXjl#?mJZE{NPcIQs(sO4(lb*((|59-KY5cJ>D;AieiYee0&Zm+D(L
WZ`@?@l5yguoi5!#xy>`8*<1i=&LVpN

diff --git a/textproc.asm b/textproc.asm
index 8b79b17..e632d29 100644
--- a/textproc.asm
+++ b/textproc.asm
@@ -803,7 +803,11 @@ NotBattery
 	beq DefActivationEnd
 NotWhiteFlag
 NoDeactivateWhiteFlag
+	; activate new defensive
     sta ActiveDefenceWeapon,x
+	; set defensive energy
+    lda DefensiveEnergy,y
+    sta ShieldEnergy,x
 DecreaseDefensive
     ; decrease number of defensives
     lda TanksWeaponsTableL,x
@@ -815,8 +819,6 @@ DecreaseDefensive
     sbc #1
     sta (weaponPointer),y
     
-    lda DefensiveEnergy,y
-    sta ShieldEnergy,x
 DefActivationEnd
     jmp WaitForKeyRelease ; rts