diff --git a/Atari/textproc.asm b/Atari/textproc.asm index 1214b26..b162e4d 100644 --- a/Atari/textproc.asm +++ b/Atari/textproc.asm @@ -150,6 +150,13 @@ NotGravity sta RandomMountains rts NoMountains + cmp #$08 + bne NoBlackHole + lda BlackHole + eor #$5d ; cursor down character + sta BlackHole + rts +NoBlackHole ldy GradientNr iny cpy #$03 @@ -170,6 +177,8 @@ NoGradientLoop .proc OptionsInversion ; Additional option symbols + lda BlackHole + sta OptionsHere+328 lda RandomMountains sta OptionsHere+288 lda WindChangeInRound diff --git a/artwork/talk.asm b/artwork/talk.asm index 843be4f..4c773f7 100644 --- a/artwork/talk.asm +++ b/artwork/talk.asm @@ -53,7 +53,7 @@ dta d"I'M GONNA BREAK YOUR FACE!"^ dta d"MAMA SAID KNOCK YOU OUT!"^ dta d"I HOPE YOU ENJOY PAIN!"^ - dta d"HOW'D YOU LIKE ONE ACROSS YOUR LIPS?"^ ;(sanford and son) +; dta d"HOW'D YOU LIKE ONE ACROSS YOUR LIPS?"^ ;(sanford and son) ;---------------------------- dta d"PARTING IS SUCH SWEET SORROW... NOT!"^ dta d"UGH!"^ @@ -116,10 +116,10 @@ dta d"I'LL BE BACK..."^ dta d"I'VE GOT LAWYERS!"^ dta d"CALL 1-900-SUE-TANK."^ - dta d"YOU BIG DUMMY!"^ ;(sanford and son) +; dta d"YOU BIG DUMMY!"^ ;(sanford and son) LEND -NumberOfOffensiveTexts=54 -NumberOfDeffensiveTexts=62 +NumberOfOffensiveTexts=53 +NumberOfDeffensiveTexts=61 .endp hoverFull dta d"MY HOVERCRAFT IS FULL OF EELS!"^ hoverFullEnd diff --git a/grafproc.asm b/grafproc.asm index 1be436b..5e1bbdf 100644 --- a/grafproc.asm +++ b/grafproc.asm @@ -1237,6 +1237,16 @@ NoParachuteWeapon beq ThereWasNoParachute jsr DrawTankParachute ThereWasNoParachute + lda BlackHole + beq NotBlackHole + lda Ytankstable,x + cmp #screenheight-1 + bcc NotBlackHole + lda #0 + sta eXistenZ,x + sta LastExistenZ,x + sta Energy,x +NotBlackHole ; ldx TankNr jsr PutTankNr ; redraw tank after erase parachute (exactly for redraw leaky schield :) ) mva #sfx_silencer sfx_effect diff --git a/scorch.asm b/scorch.asm index 8404365..17232a0 100644 --- a/scorch.asm +++ b/scorch.asm @@ -30,7 +30,7 @@ ;--------------------------------------------------- .macro build - dta d"1.40" ; number of this build (4 bytes) + dta d"1.41" ; number of this build (4 bytes) .endm .macro RMTSong @@ -54,7 +54,7 @@ AdditionalZPvariables = $20 .zpvar MeteorsRound .byte ; set 7th bit - block meteors in round -FirstZpageVariable = $51 +FirstZpageVariable = $50 .zpvar DliColorBack .byte = FirstZpageVariable .zpvar ClearSky .byte ; $ff - Crear sky during drawmountains, 0 - no clear sky .zpvar PaddleState .byte ; old state 2nd button for 2 buttons joysticks @@ -144,6 +144,7 @@ FirstZpageVariable = $51 .zpvar RandomMountains .byte ; mountains type change after each turn flag ; (0 - round only, >0 - each turn) .zpvar FastSoilDown .byte ; 0 - standard, >0 - fast + .zpvar BlackHole .byte ; 0 - no, >0 - yes .zpvar XHit .word .zpvar delta .word .zpvar HowMuchToFall .byte diff --git a/scorch.bin b/scorch.bin index 5927452..c2384ba 100644 Binary files a/scorch.bin and b/scorch.bin differ diff --git a/scorch.xex b/scorch.xex index c5fe93d..3027a73 100644 Binary files a/scorch.xex and b/scorch.xex differ diff --git a/scorchC64.asm b/scorchC64.asm index dd41d57..45ebfa3 100644 --- a/scorchC64.asm +++ b/scorchC64.asm @@ -24,7 +24,7 @@ ;--------------------------------------------------- .macro build - dta d"1.33" ; number of this build (4 bytes) + dta d"1.41" ; number of this build (4 bytes) .endm .macro RMTSong @@ -35,7 +35,7 @@ icl 'definitions.asm' ;--------------------------------------------------- -FirstZpageVariable = $53 ; $57 +FirstZpageVariable = $52 ; $57 .zpvar DliColorBack .byte = FirstZpageVariable .zpvar MeteorsFlag .byte ; set 7th bit - block meteors .zpvar MeteorsRound .byte ; set 7th bit - block meteors in round @@ -44,6 +44,7 @@ FirstZpageVariable = $53 ; $57 .zpvar WindChangeInRound .byte ; wind change after each turn (not round only) flag - (0 - round only, >0 - each turn) .zpvar RandomMountains .byte ; mountains type change after each turn flag - (0 - round only, >0 - each turn) .zpvar FastSoilDown .byte ; 0 - standard, >0 - fast + .zpvar BlackHole .byte ; 0 - no, >0 - yes .zpvar JoystickNumber .byte .zpvar LazyFlag .byte ; 7 bit - run Lazy Darwin, 6 bit - run Lazy Boy or Darwin (!) after inventory, 0 - nothing .zpvar SpyHardFlag .byte ; >$7f - run SpyHard after inventory diff --git a/scorchC64.prg b/scorchC64.prg index 531c621..51fdf8e 100644 Binary files a/scorchC64.prg and b/scorchC64.prg differ diff --git a/scorch_cart.xex b/scorch_cart.xex index 4f5a5bd..b041b79 100644 Binary files a/scorch_cart.xex and b/scorch_cart.xex differ diff --git a/weapons.asm b/weapons.asm index 6054de6..d28836a 100644 --- a/weapons.asm +++ b/weapons.asm @@ -2961,7 +2961,9 @@ GoDown adw temp #4 ; center of the tank ldy #0 lda (temp),y - sta OverTankDir ; not elegant!!! Reuse as height of tank flight + tay + dey ; 1 pixel up! + sty OverTankDir ; not elegant!!! Reuse as height of tank flight FloatDown lda ytankstable,x cmp OverTankDir