diff --git a/Atari/display_static.asm b/Atari/display_static.asm index 6134428..2cda5cf 100644 --- a/Atari/display_static.asm +++ b/Atari/display_static.asm @@ -58,8 +58,11 @@ NameScreen5 dta d" - Proceed " .ENDIF ;----------------------------------------------- +OptionsSubTitle + dta d" Unknown Father of All Games" +;----------------------------------------------- MoreUp - dta d" " + dta d" " ; common part of this text and OptionsSubTitle :) dta 92,92,92 dta d" more " dta 92,92,92 @@ -124,8 +127,6 @@ InventoryTitle dta d"activate weapons"* GameOverTitle2 dta d" Player Points Hits Earned Money " -OptionsSubTitle - dta d" Unknown Father of All Games " ;----------------------------------------------------- ;-------------display-lists--------------------------- ;----------------------------------------------------- diff --git a/Atari/lib/5200MACRO.ASM b/Atari/lib/5200MACRO.ASM index 1bfddf2..506a5cd 100644 --- a/Atari/lib/5200MACRO.ASM +++ b/Atari/lib/5200MACRO.ASM @@ -113,10 +113,11 @@ .endif ?rand lda random - cmp #:1 ;floor - bcc ?rand - cmp #:2+1 ;ceiling + cmp #:2+1-:1 ;ceiling bcs ?rand + .if %1>0 ; if floor = 0 - no add offset + adc #:1 + .endif .endm ;------------------------------------- .macro phx diff --git a/Atari/lib/MACRO.ASM b/Atari/lib/MACRO.ASM index 477e2f5..6ded402 100644 --- a/Atari/lib/MACRO.ASM +++ b/Atari/lib/MACRO.ASM @@ -134,10 +134,11 @@ .endif ?rand lda random - cmp #:1 ;floor - bcc ?rand - cmp #:2+1 ;ceiling + cmp #:2+1-:1 ;ceiling bcs ?rand + .if %1>0 ; if floor = 0 - no add offset + adc #:1 + .endif .endm ;------------------------------------- .macro phx diff --git a/Atari/textproc.asm b/Atari/textproc.asm index 25df72e..49e8b7e 100644 --- a/Atari/textproc.asm +++ b/Atari/textproc.asm @@ -1722,9 +1722,9 @@ FastTank jsr IsKeyPressed bne MainTanksFloatingLoop ; neverending loop mva #$00 ScrollFlag ; credits scroll off - jsr MakeDarkScreen - jmp GameOverResultsClear - ; rts + jmp MakeDarkScreen +; jsr GameOverResultsClear +; rts RandomizeTankPos randomize 10 (32-7) ; 10 not 8 - barrel !! :) sta Ytankstable,x @@ -1743,14 +1743,13 @@ RandomizeTankPos lda XtankOffsetGO_H,x adc #0 sta XtankstableH,x + ldy #0 lda random cmp #32 ; like 1:8 - bcc NowFastTank - lda #0 - sta ActiveDefenceWeapon,x - rts -NowFastTank - lda #1 + bcs NowNotFastTank + iny +NowNotFastTank + tya sta ActiveDefenceWeapon,x rts GameOverResultsClear diff --git a/C64/lib/MACRO.ASM b/C64/lib/MACRO.ASM index 92f8d13..c61d971 100644 --- a/C64/lib/MACRO.ASM +++ b/C64/lib/MACRO.ASM @@ -252,10 +252,11 @@ upstartEnd .endif ?rand lda random - cmp #:1 ;floor - bcc ?rand - cmp #:2+1 ;ceiling + cmp #:2+1-:1 ;ceiling bcs ?rand + .if %1>0 ; if floor = 0 - no add offset + adc #:1 + .endif .endm ;------------------------------------- .macro phx diff --git a/scorch.asm b/scorch.asm index f29cdde..8d15712 100644 --- a/scorch.asm +++ b/scorch.asm @@ -507,9 +507,6 @@ StillWait lda STRIG0 beq StillWait .IF TARGET = 800 - ; second joy button -; jsr GetKey.Check2button -; bcs StillWait lda SKSTAT cmp #$ff bne StillWait diff --git a/scorch.bin b/scorch.bin index 271cc2d..ae43e8f 100644 Binary files a/scorch.bin and b/scorch.bin differ diff --git a/scorch.xex b/scorch.xex index 58b2758..f5c3460 100644 Binary files a/scorch.xex and b/scorch.xex differ