diff --git a/ai.asm b/ai.asm index a6084f0..9cd889a 100644 --- a/ai.asm +++ b/ai.asm @@ -22,8 +22,9 @@ pha lda AIRoutines,y pha - jsr PrepareAIShoot - rts +; it's no necessary - PrepareAIShoot is next proc :) +; jsr PrepareAIShoot +; rts .endp ;---------------------------------------------- .proc PrepareAIShoot diff --git a/constants.asm b/constants.asm index a199743..8689ee9 100644 --- a/constants.asm +++ b/constants.asm @@ -208,7 +208,12 @@ TanksNamesDefault dta d"4th.Tank" dta d"5th.Tank" dta d"6th.Tank" - +;------------------------------------------------- +TankShapesTable .BYTE char_tank1___________ + .BYTE char_tank2___________ + .BYTE char_tank3___________ + .BYTE char_tank4___________ +;------------------------------------------------- WeaponPriceH ; weapons prices (tables with prices of weapons) .by >price_Baby_Missile___ .by >price_Missile________ diff --git a/constants_top.asm b/constants_top.asm index 4d849d6..c17e2f3 100644 --- a/constants_top.asm +++ b/constants_top.asm @@ -7,10 +7,6 @@ TankColoursTable .BYTE $58,$2a,$96,$ca,$7a,$ed ;TanksPMOrder .BYTE 4,3,1,5,0,2 ; 0-3 = P0-P3 , 4 = M0+M1 , 5 = M2+M3 TankStatusColoursTable .BYTE $74,$c4,$24,$e4,$54,$94 ; Adam's order TanksPMOrder .BYTE 4,3,1,5,0,2 ; 0-3 = P0-P3 , 4 = M0+M1 , 5 = M2+M3 -TankShapesTable .BYTE char_tank1___________ - .BYTE char_tank2___________ - .BYTE char_tank3___________ - .BYTE char_tank4___________ dliColorsBack :10 .by $02,$00 dliColorsFore diff --git a/grafproc.asm b/grafproc.asm index 3165903..154aac6 100644 --- a/grafproc.asm +++ b/grafproc.asm @@ -2209,13 +2209,13 @@ ybarrel .endp ;-------------------------------------------------- .proc SetPMWidth + lda #%01010101 + sta sizem ; all missiles, double width lda #$00 sta sizep0 ; P0-P3 widths sta sizep0+1 sta sizep0+2 sta sizep0+3 - lda #%01010101 - sta sizem ; all missiles, double width rts .endp diff --git a/scorch.asm b/scorch.asm index 1964aed..55be6ee 100644 --- a/scorch.asm +++ b/scorch.asm @@ -334,10 +334,7 @@ MainGameLoop jsr CallPurchaseForEveryTank mva #0 SpyHardFlag - - ; issue #72 (glitches when switches) jsr MakeDarkScreen - bit escFlag bmi START @@ -350,14 +347,14 @@ MainGameLoop bmi START jvs GoGameOver - mva #0 TankNr ; - jsr SortSequence + mva #0 TankNr ; + sta COLBAKS ; set background color to black + sta JoystickNumber ; set joystick port for player + ; Hide all (easier than hide last ;) ) tanks jsr cleartanks ; A=0 - sta COLBAKS ; set background color to black - sta JoystickNumber ; set joystick port for player ; here gains and losses should be displayed (dollars) ; finally we have changed our minds and money of players @@ -370,6 +367,7 @@ MainGameLoop jsr DisplayResults jsr DemoModeOrKey + jsr MakeDarkScreen ldx NumberOfPlayers dex @@ -463,13 +461,10 @@ eskipzeroing lda GameIsOver beq NoGameOverYet GoGameOver - jsr MakeDarkScreen jsr GameOverScreen jmp START NoGameOverYet inc CurrentRoundNr - jsr MakeDarkScreen ; issue #72 - ; jsr RmtSongSelect ; ????? mva #sfx_silencer sfx_effect jmp MainGameLoop @@ -487,8 +482,8 @@ NoGameOverYet RmtSong song_ingame - jsr SetPMWidth - lda #0 + jsr SetPMWidth ; A=0 !!! + ;lda #0 sta AfterBFGflag ; reset BFG flag sta COLOR2 ; status line "off" sta COLOR1 @@ -1190,7 +1185,7 @@ MakeTanksVisible nop .IF TARGET = 800 nop ; necessary on 800 because DLIs take less time, jitter visible without it - ;nop + nop .ENDIF sta COLPF1 ; lda dliColorsFore,y ; mountains colors array diff --git a/scorch.bin b/scorch.bin index c0a5e3a..e3b8011 100644 Binary files a/scorch.bin and b/scorch.bin differ diff --git a/scorch.xex b/scorch.xex index d0737fc..d8c35dd 100644 Binary files a/scorch.xex and b/scorch.xex differ