From 572bee982a1d261688d8f79ecf89ab5d065f8500 Mon Sep 17 00:00:00 2001 From: Pecusx Date: Thu, 12 May 2022 19:02:26 +0200 Subject: [PATCH 1/4] Test I'am in develop branch :) --- scorch.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scorch.asm b/scorch.asm index eb25c8b..3ce13c8 100644 --- a/scorch.asm +++ b/scorch.asm @@ -3,7 +3,7 @@ ;--------------------------------------------------- ;by Tomasz 'pecus' Pecko and Pawel 'pirx' Kalinowski ;Warsaw 2000,2001,2002,2003,2009,2012,2013 -;Miami 2022 +;Miami&Warsaw 2022 ;you can contact us at pecus@poczta.fm or pirx@5oft.pl ;home page of this project is https://github.com/pkali/scorch_src From 91b39e736ba18586c7979042d9afbb4dc4c9cc00 Mon Sep 17 00:00:00 2001 From: Pecusx Date: Thu, 12 May 2022 19:45:42 +0200 Subject: [PATCH 2/4] Minor optimizations LiquidDirt and TypeChar (8x8 on graphics screen - like tanks) are little faster now. --- grafproc.asm | 26 +++++++++----------------- scorch.xex | Bin 37628 -> 37622 bytes weapons.asm | 4 +++- 3 files changed, 12 insertions(+), 18 deletions(-) diff --git a/grafproc.asm b/grafproc.asm index d0bfb38..85bce0f 100755 --- a/grafproc.asm +++ b/grafproc.asm @@ -1175,7 +1175,7 @@ DrawLine .proc sec sbc ydraw sta tempbyte01 - jsr plot + jsr plot.MakePlot ;rts jmp IntoDraw ; jumps inside Draw routine ; because one pixel is already plotted @@ -1261,29 +1261,21 @@ CopyMask ldx ybit beq MaskOK00 MakeMask00 - clc ; INVERSE - ror mask1 + lsr mask1 ; INVERSE ror mask2 - clc ; INVERSE - ror mask1+1 + lsr mask1+1 ; INVERSE ror mask2+1 - clc ; INVERSE - ror mask1+2 + lsr mask1+2 ; INVERSE ror mask2+2 - clc ; INVERSE - ror mask1+3 + lsr mask1+3 ; INVERSE ror mask2+3 - clc ; INVERSE - ror mask1+4 + lsr mask1+4 ; INVERSE ror mask2+4 - clc ; INVERSE - ror mask1+5 + lsr mask1+5 ; INVERSE ror mask2+5 - clc ; INVERSE - ror mask1+6 + lsr mask1+6 ; INVERSE ror mask2+6 - clc ; INVERSE - ror mask1+7 + lsr mask1+7 ; INVERSE ror mask2+7 sec ; INVERSE ror char1 diff --git a/scorch.xex b/scorch.xex index b07755f7358f4e329a146a0cd1894ecc607c923c..ad2c7973945652d2a6f77ba06e0ca86e52c0b6e1 100644 GIT binary patch delta 12247 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 AtpET3 delta 12086 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 diff --git a/weapons.asm b/weapons.asm index 2225850..2a2a350 100755 --- a/weapons.asm +++ b/weapons.asm @@ -949,11 +949,13 @@ FillHole adw xdraw #mountaintable tempXROLLER lda (tempXROLLER),y sta ydraw + beq ToHighFill ; if we filled all playfield (very rare but possible) dec ydraw ; one pixel up +ToHighFill lda ydraw sta (tempXROLLER),y ;mountaintable update mva #1 color - jsr plot + jsr plot.MakePlot .nowarn dew FillCounter cpw FillCounter #0 jne RepeatFill From de5bfab2a81e2ecb009bd3ce61f2d54079980af7 Mon Sep 17 00:00:00 2001 From: Pecusx Date: Fri, 13 May 2022 09:18:50 +0200 Subject: [PATCH 3/4] Tank colors bugfix & new DLI for purchase screen He, he. The tank colors were not taken from the table :) --- constants.asm | 3 +++ scorch.asm | 33 ++++++++++++++++++++++----------- scorch.xex | Bin 37622 -> 37664 bytes textproc.asm | 2 +- 4 files changed, 26 insertions(+), 12 deletions(-) diff --git a/constants.asm b/constants.asm index fb4fbb1..7fccbc1 100644 --- a/constants.asm +++ b/constants.asm @@ -6,10 +6,13 @@ ;==========================CONSTANT TABLES, do not erase!=========================== ;=================================================================================== TankColoursTable .BYTE $5a,$dc,$88,$26,$a8,$02 +TankStatusColoursTable .BYTE $52,$d2,$82,$22,$a2,$02 dliColorsBack :10 .by $04,$02 dliColorsFore .by $0e +TextBackgroundColor = $02 ; REAL constans - use: LDA #TextBackgroundColor +TextForegroundColor = $0c CashOptionL ;(one zero less than on the screen) .by 0,<200,<500,<800,<1000 CashOptionH diff --git a/scorch.asm b/scorch.asm index 3ce13c8..af8dcfd 100644 --- a/scorch.asm +++ b/scorch.asm @@ -151,10 +151,12 @@ START ; for the round #1 shooting sequence is random MainGameLoop - VDLI DLIinterrupt ; jsr SetDLI + VDLI DLIinterruptText ; jsr SetDLI for text (purchase) screen jsr CallPurchaseForEveryTank + VDLI DLIinterruptGraph ; jsr SetDLI for graphics (game) screen + mwa #dl dlptrs lda dmactls and #$fc @@ -395,7 +397,7 @@ DoNotFinishTheRound mva #1 color ;to display flying point - lda TankColoursTable,x + lda TankStatusColoursTable,x sta colpf2s ; set color of status line lda SkillTable,x @@ -784,8 +786,8 @@ deletePtr = temp jsr WeaponCleanup - mva #$2 colpf2s - mva #12 colpf3s + mva #TextBackgroundColor colpf2s + mva #TextForegroundColor colpf3s mva #>WeaponFont chbas ;parameter for old plot (unPlot) max 5 points @@ -819,16 +821,16 @@ SetunPlots lda #$10 ; P/M priorities (bit 4 joins missiles) sta gtictls jsr PMoutofScreen - lda #$50 ; temporary colours of sprites under tanks + lda TankColoursTable ; temporary colours of sprites under tanks sta $2c0 - lda #$30 + lda TankColoursTable+1 sta $2c1 - lda #$70 + lda TankColoursTable+2 sta $2c2 - lda #$90 + lda TankColoursTable+3 sta $2c3 - LDA #$B0 - STA COLPF3S + LDA TankColoursTable+4 + STA COLPF3S ; WHAT THE FUCK ???? !!!! ???? mva #0 hscrol @@ -867,7 +869,7 @@ ClearResults rts .endp -DLIinterrupt .proc +DLIinterruptGraph .proc pha phy ldy dliCounter @@ -889,6 +891,15 @@ DLIinterrupt .proc rti .endp +DLIinterruptText .proc + pha + sta WSYNC + mva #TextBackgroundColor colpf2 + mva #TextForegroundColor colpf3 + pla + rti +.endp + VBLinterrupt .proc pha phx diff --git a/scorch.xex b/scorch.xex index ad2c7973945652d2a6f77ba06e0ca86e52c0b6e1..1c4fd3e9f4b877cd6c3e004fcc64169d4b48dbae 100644 GIT binary patch delta 12488 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 HbGrQxffl~V delta 12519 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 diff --git a/textproc.asm b/textproc.asm index 31f5aa9..f70562a 100755 --- a/textproc.asm +++ b/textproc.asm @@ -228,7 +228,7 @@ AfterManualPurchase jsr PMoutofScreen ldx tankNr - lda TankColoursTable,x + lda TankStatusColoursTable,x sta colpf2s ; we are clearing list of the weapons From d766088b66c869c26417e9586c3c920ae5275be5 Mon Sep 17 00:00:00 2001 From: pkali Date: Sat, 14 May 2022 08:13:32 -0400 Subject: [PATCH 4/4] colors upd+weapon change sfx --- constants.asm | 8 ++++---- scorch.xex | Bin 37664 -> 37669 bytes weapons.asm | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/constants.asm b/constants.asm index 7fccbc1..b45672f 100644 --- a/constants.asm +++ b/constants.asm @@ -5,12 +5,12 @@ ;=================================================================================== ;==========================CONSTANT TABLES, do not erase!=========================== ;=================================================================================== -TankColoursTable .BYTE $5a,$dc,$88,$26,$a8,$02 -TankStatusColoursTable .BYTE $52,$d2,$82,$22,$a2,$02 +TankColoursTable .BYTE $88,$cc,$38,$1c,$6a,$02 +TankStatusColoursTable .BYTE $82,$c2,$32,$12,$62,$02 dliColorsBack - :10 .by $04,$02 + :10 .by $02,$00 dliColorsFore - .by $0e + .by $0a TextBackgroundColor = $02 ; REAL constans - use: LDA #TextBackgroundColor TextForegroundColor = $0c CashOptionL ;(one zero less than on the screen) diff --git a/scorch.xex b/scorch.xex index 1c4fd3e9f4b877cd6c3e004fcc64169d4b48dbae..02a6f973f898656fc6474f2818e6c542f1ca8206 100644 GIT binary patch delta 12208 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 J4eMw1`#)XOXLSGo delta 12244 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 diff --git a/weapons.asm b/weapons.asm index 2a2a350..885927b 100755 --- a/weapons.asm +++ b/weapons.asm @@ -1153,6 +1153,7 @@ NotThrough90DegreesRight jmp BeforeFire pressedTAB + mva #sfx_purchase sfx_effect ldx TankNr inc ActiveWeapon,x lda ActiveWeapon,x