diff --git a/ai.asm b/ai.asm index 430bf31..26aa90c 100644 --- a/ai.asm +++ b/ai.asm @@ -545,10 +545,7 @@ skipThisPlayer sta RandBoundaryHigh+1 jsr RandomizeForce RepeatAim - lda ForceTableL,x - sta Force - lda ForceTableH,x - sta Force+1 + jsr Table2Force ; wind correction 90+(wind/8) mwa Wind temp2 :7 lsrw temp2 diff --git a/scorch.asm b/scorch.asm index 43b66c6..cf6142f 100644 --- a/scorch.asm +++ b/scorch.asm @@ -1631,6 +1631,14 @@ LimitForce .endp ;---------------------------------------------- +.proc Table2Force + lda ForceTableL,x + sta Force + lda ForceTableH,x + sta Force+1 + rts +.endp +;---------------------------------------------- .proc MoveBarrelToNewPosition mva #1 Erase jsr DrawTankNr.BarrelChange diff --git a/scorch.bin b/scorch.bin index 261139b..e107bc0 100644 Binary files a/scorch.bin and b/scorch.bin differ diff --git a/scorch.xex b/scorch.xex index 72f6e2f..630a2e3 100644 Binary files a/scorch.xex and b/scorch.xex differ diff --git a/weapons.asm b/weapons.asm index dcf7cd5..c279a19 100644 --- a/weapons.asm +++ b/weapons.asm @@ -1473,10 +1473,7 @@ AfterOffensiveText mva #$ff LaserFlag ; $ff - Laser bne AfterStrongShoot NotStrongShoot - lda ForceTableL,x - sta Force - lda ForceTableH,x - sta Force+1 + jsr Table2Force bit TestFlightFlag bmi AfterStrongShoot mva #sfx_shoot sfx_effect @@ -1968,11 +1965,7 @@ BouncyCastle ; ---------------- get fire parameters again ldx TankNr - lda ActiveWeapon,x - lda ForceTableL,x - sta Force - lda ForceTableH,x - sta Force+1 + jsr Table2Force lda AngleTable,x sta Angle