From 9f1720e97008bfacf8485b7d442fbbd58bab7ea5 Mon Sep 17 00:00:00 2001 From: pkali Date: Mon, 30 May 2022 05:54:00 -0400 Subject: [PATCH] work in progress... --- grafproc.asm | 133 ++++++++++++++++----------------------------------- scorch.asm | 14 +++--- scorch.xex | Bin 37861 -> 37845 bytes weapons.asm | 4 +- 4 files changed, 50 insertions(+), 101 deletions(-) diff --git a/grafproc.asm b/grafproc.asm index 50f841d..e5dc298 100644 --- a/grafproc.asm +++ b/grafproc.asm @@ -555,11 +555,10 @@ UnequalTanks bpl CheckNextTank rts .endp -;------------------------------------------------- -drawtanks -;------------------------------------------------- - +;------------------------------------------------- +.proc drawtanks +;------------------------------------------------- lda tanknr pha ldx #$00 @@ -576,8 +575,9 @@ DrawNextTank sta tankNr rts +.endp ;--------- -drawtanknr +.proc DrawTankNr ldx tanknr ; let's check the energy lda eXistenZ,x @@ -665,11 +665,11 @@ ZeroesToGo NoPlayerMissile DoNotDrawTankNr rts +.endp ;-------------------------------------------------- .proc drawmountains ;-------------------------------------------------- - mwa #0 xdraw mwa #mountaintable modify mva #1 color @@ -835,6 +835,7 @@ ColumnIsReady mva #sfx_silencer sfx_effect rts .endp + ;-------------------------------------------------- .proc calculatemountains ;-------------------------------------------------- @@ -962,6 +963,7 @@ SetYofNextTank rts .endp ; **************************************************** + ; ----------------------------------------- .proc unPlot ; plots a point and saves the plotted byte, reverts the previous plot. @@ -1066,6 +1068,7 @@ SkipThisPlot EndOfUnPlot rts .endp + ; ----------------------------------------- .proc plot ;plot (xdraw, ydraw, color) ; color == 1 --> put pixel @@ -1100,11 +1103,7 @@ MakePlot lsr lsr tay ;save -;--- - - - - + ;--- ldx ydraw lda linetableL,x sta xbyte @@ -1126,6 +1125,7 @@ ClearPlot sta (xbyte),y rts .endp + ; ----------------------------------------- .proc point ; ----------------------------------------- @@ -1135,7 +1135,6 @@ ClearPlot ; let's calculate coordinates from xdraw and ydraw mwa xdraw xbyte - lda xbyte and #$7 sta ybit @@ -1147,9 +1146,7 @@ ClearPlot lsr lsr tay ;save - -;--- - + ;--- ldx ydraw lda linetableL,x sta xbyte @@ -1163,6 +1160,7 @@ ClearPlot eor bittable,x rts .endp + ;-------------------------------------------------- .proc DrawLine ;-------------------------------------------------- @@ -1174,20 +1172,19 @@ ClearPlot jsr plot.MakePlot ;rts jmp IntoDraw ; jumps inside Draw routine - ; because one pixel is already plotted + ; because one pixel is already plotted -loopdraw - - lda (xbyte),y - and bittable2,x - sta (xbyte),y +@ + lda (xbyte),y + and bittable2,x + sta (xbyte),y IntoDraw - adw xbyte #screenBytes - dec tempbyte01 - bne loopdraw + adw xbyte #screenBytes + dec tempbyte01 + bne @- rts .endp -; + ; ------------------------------------------ .proc TypeChar ; puts char on the graphics screen @@ -1238,7 +1235,6 @@ CopyMask lsrw xbyte ; div 8 rorw xbyte rorw xbyte - ;--- ldy xbyte @@ -1255,46 +1251,15 @@ CopyMask ldx ybit beq MaskOK00 MakeMask00 - lsr mask1 - ror mask2 - lsr mask1+1 - ror mask2+1 - lsr mask1+2 - ror mask2+2 - lsr mask1+3 - ror mask2+3 - lsr mask1+4 - ror mask2+4 - lsr mask1+5 - ror mask2+5 - lsr mask1+6 - ror mask2+6 - lsr mask1+7 - ror mask2+7 - sec - ror char1 - ror char2 - sec - ror char1+1 - ror char2+1 - sec - ror char1+2 - ror char2+2 - sec - ror char1+3 - ror char2+3 - sec - ror char1+4 - ror char2+4 - sec - ror char1+5 - ror char2+5 - sec - ror char1+6 - ror char2+6 - sec - ror char1+7 - ror char2+7 + .rept 8 + lsr mask1+# + ror mask2+# + .endr + .rept 8 + sec + ror char1+# + ror char2+# + .endr dex bne MakeMask00 MaskOK00 @@ -1327,6 +1292,7 @@ CharLoopi EndPutChar rts .endp + ; ------------------------------------------ .proc PutChar4x4 ; puts 4x4 pixels char on the graphics screen @@ -1368,10 +1334,7 @@ CopyChar lda (fontind),y ; Y must be 0 !!!! bit nibbler4x4 bpl GetUpper4bits - rol - rol - rol - rol + :4 rol GetUpper4bits ora #$0f sta char1,x @@ -1396,7 +1359,6 @@ GetUpper4bits lsrw xbyte ; div 8 rorw xbyte rorw xbyte - ;--- ldy xbyte lda ydraw ; y = y - 3 because left lower. @@ -1412,26 +1374,15 @@ GetUpper4bits ldx ybit beq MaskOK01 MakeMask01 - lsr mask1 - ror mask2 - lsr mask1+1 - ror mask2+1 - lsr mask1+2 - ror mask2+2 - lsr mask1+3 - ror mask2+3 - sec - ror char1 - ror char2 - sec - ror char1+1 - ror char2+1 - sec - ror char1+2 - ror char2+2 - sec - ror char1+3 - ror char2+3 + .rept 4 + lsr mask1+# + ror mask2+# + .endr + .rept 4 + sec + ror char1+# + ror char2+# + .endr dex bne MakeMask01 MaskOK01 diff --git a/scorch.asm b/scorch.asm index 0f19242..93258bd 100644 --- a/scorch.asm +++ b/scorch.asm @@ -474,8 +474,8 @@ missed jsr DisplayOffensiveTextNr NextPlayerShoots - mva #1 Erase - jsr drawtanks + ;mva #1 Erase + ;jsr drawtanks ;before it shoots, the eXistenZ table must be ;updated accordingly to actual energy (was forgotten, sorry to ourselves) @@ -514,11 +514,9 @@ B0 DEY ;was setup of maximum energy for players - mva #0 Erase - jsr drawtanks + ;mva #0 Erase + ;jsr drawtanks - ;inc TankNr - ;lda TankNr inc:lda TankSequencePointer cmp NumberOfPlayers bne PlayersAgain @@ -1056,14 +1054,14 @@ rotateRight;older is lower bne MoveBarrelToNewPosition mva #$30 CharCode ; if angle goes through 0 we clear the barrel - jsr drawtankNrX + jsr DrawTankNr.drawtankNrX jmp MoveBarrelToNewPosition rotateLeft dec angleTable,x bpl MoveBarrelToNewPosition mva #$2e CharCode - jsr drawtankNrX + jsr DrawTankNr.drawtankNrX jmp MoveBarrelToNewPosition diff --git a/scorch.xex b/scorch.xex index 43221207f32c0ab57a4b4645c4aef3f405ffcefa..4e71576955ee9eb9e4192bbb2aa6c5f5895c5df8 100644 GIT binary patch delta 12682 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 diff --git a/weapons.asm b/weapons.asm index 57d9c23..278c945 100644 --- a/weapons.asm +++ b/weapons.asm @@ -1129,7 +1129,7 @@ pressedLeft cmp #$ff ; if angle goes through 0 we clear the barrel bne NotThrough90DegreesLeft mva #$2e CharCode - jsr drawtankNrX + jsr DrawTankNr.drawtankNrX NotThrough90DegreesLeft cmp #(255-91) jne BeforeFire @@ -1144,7 +1144,7 @@ pressedRight lda AngleTable,x bne NotThrough90DegreesRight mva #$30 CharCode ; if angle goes through 0 we clear the barrel - jsr drawtankNrX + jsr DrawTankNr.drawtankNrX NotThrough90DegreesRight cmp #91 jne BeforeFire