diff --git a/ai.asm b/ai.asm index c4ac11f..91323b4 100644 --- a/ai.asm +++ b/ai.asm @@ -279,12 +279,25 @@ NoBatteries cmp #1 bne UseBattery.NoBatteries ; nearest RTS ; now use defensive like Tosser - jmp TosserDefensives + ;jmp TosserDefensives .endp ;---------------------------------------------- .proc TosserDefensives ; use best defensive :) ; allways + jsr GetBestDefensive + bcc NoUseDefensive + ; and SFX + mva #sfx_auto_defense sfx_effect + ldy #7 + jsr PauseYFrames ; wait 14 frames (Defense SFX) +NoUseDefensive + ; update status line + jmp DisplayStatus ; jsr/rts +; rts +.endp +;---------------------------------------------- +.proc GetBestDefensive ; first check check if any is in use lda ActiveDefenceWeapon,x bne DefensiveInUse @@ -304,15 +317,11 @@ NoBatteries sta ActiveDefenceWeapon,x lda DefensiveEnergy,y sta ShieldEnergy,x - ; and SFX - mva #sfx_auto_defense sfx_effect - ldy #7 - jsr PauseYFrames ; wait 14 frames (Defense SFX) + sec + rts DefensiveInUse NoUseDefensive -DefensiveStatusLine - ; update status line - jsr DisplayStatus + clc rts .endp ;---------------------------------------------- diff --git a/constants.asm b/constants.asm index 18bcac4..cb85d09 100644 --- a/constants.asm +++ b/constants.asm @@ -659,7 +659,7 @@ CreditsStart dta d" "* dta d"and"^ dta d"Wendell Hicken"^ - dta d"for the original Scorched Earth"^ + dta d"for original Scorched Earth"^ .IF TARGET = 800 dta d" "* dta d"Stay tuned for the FujiNet version!"^ diff --git a/scorch.bin b/scorch.bin index 8ac78f7..d457210 100644 Binary files a/scorch.bin and b/scorch.bin differ diff --git a/scorch.xex b/scorch.xex index 0d36d2d..f999f2b 100644 Binary files a/scorch.xex and b/scorch.xex differ diff --git a/weapons.asm b/weapons.asm index 3555b63..d80ade6 100644 --- a/weapons.asm +++ b/weapons.asm @@ -2547,7 +2547,7 @@ NoWall ; ------------------------------------------------- jsr PrepareAIShoot.WepTableToTemp jsr UseBattery - jmp TosserDefensives + jmp GetBestDefensive ; rts .endp ; -------------------------------------------------