From 98e866abddcbc18683d6a64c56bab8cfdead0756 Mon Sep 17 00:00:00 2001 From: pkali Date: Sat, 18 Jun 2022 20:17:16 -0400 Subject: [PATCH] elaborate fix of a simple issue... #92 --- constants.asm | 2 +- grafproc.asm | 6 +++--- scorch.asm | 10 +++++++--- scorch.xex | Bin 39193 -> 39123 bytes textproc.asm | 35 ++++++++++++----------------------- weapons.asm | 13 ------------- 6 files changed, 23 insertions(+), 43 deletions(-) diff --git a/constants.asm b/constants.asm index 65a464d..22cab8a 100644 --- a/constants.asm +++ b/constants.asm @@ -899,7 +899,7 @@ DefensiveEnergy = * - 48 .by 00 ; Fuel Tank .by 00 ; Contact Trigger weaponsOfDeath - dta 1,2,3,7,15,16,17,18,19,20,21,22,23,24,25,26,27 + dta 1,2,3,7,17,18,19,20,21,22,23,24,25,26,27 weaponsOfDeathEnd joyToKeyTable ; .by 00, 01, 02, 03, 04, 05, 06, 07, 08, 09, 10, 11, 12, 13, 14, 15 diff --git a/grafproc.asm b/grafproc.asm index d57f6ec..c6e78ca 100644 --- a/grafproc.asm +++ b/grafproc.asm @@ -1451,7 +1451,7 @@ EndPutChar ; ------------------------------------------ .proc PutChar4x4 ; puts 4x4 pixels char on the graphics screen -; in: xdraw, ydraw (LOWER left corner of the char) +; in: dx, dy (LOWER left corner of the char) ; in: CharCode4x4 (.sbyte) ; in: plot4x4color (0/1) ; all pixels are being drawn @@ -1505,7 +1505,7 @@ GetUpper4bits bpl CopyChar ; calculating coordinates from xdraw and ydraw - mwa xdraw xbyte + mwa dx xbyte lda xbyte and #$7 @@ -1516,7 +1516,7 @@ GetUpper4bits rorw xbyte ;--- ldy xbyte - lda ydraw ; y = y - 3 because left lower. + lda dy ; y = y - 3 because left lower. sec sbc #3 tax diff --git a/scorch.asm b/scorch.asm index 5341231..f4b3fb8 100644 --- a/scorch.asm +++ b/scorch.asm @@ -427,6 +427,10 @@ AfterManualShooting ShootNow jsr Shoot + ;here we clear offensive text (after a shoot) + ldy TankNr + mva #0 plot4x4color + jsr DisplayOffensiveTextNr lda HitFlag ;0 if missed beq missed @@ -438,9 +442,9 @@ ShootNow continueMainRoundLoopAfterSeppuku ;here we clear offensive text (after a shoot) - ldy TankNr - mva #0 plot4x4color - jsr DisplayOffensiveTextNr + ;ldy TankNr + ;mva #0 plot4x4color + ;jsr DisplayOffensiveTextNr AfterExplode diff --git a/scorch.xex b/scorch.xex index 968ab5f3781a6d7ad2fce159833cadd96811872e..92e363ef3101f8f5837b091aadd5b3da8f2edca8 100644 GIT binary patch delta 13527 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 delta 13548 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 We|Y}Lywcm_&AGyJM>cayuKRxr>w4M% diff --git a/textproc.asm b/textproc.asm index ec07503..29881f5 100644 --- a/textproc.asm +++ b/textproc.asm @@ -1305,6 +1305,8 @@ space dta d" " ;that's easy because we have number of tank ;and xtankstableL and H keep X position of a given tank + ;save vars (messed when printing...) + lda xtankstableL,y sta temp lda xtankstableH,y @@ -1425,12 +1427,12 @@ DOTNcharloop asl clc adc TextPositionX - sta Xdraw + sta dx lda #0 adc TextPositionX+1 - sta Xdraw+1 + sta dx+1 lda TextPositionY - sta ydraw + sta dy jsr PutChar4x4 inc TextCounter @@ -1448,6 +1450,7 @@ DOTNcharloop ;address in LineAddress4x4 ;starting from LineXdraw, LineYdraw + ldy #0 sty LineCharNr @@ -1460,8 +1463,8 @@ TypeLine4x4Loop beq EndOfTypeLine4x4 sta CharCode4x4 - mwa LineXdraw Xdraw - mva LineYdraw Ydraw + mwa LineXdraw dx + mva LineYdraw dy mva #1 plot4x4color jsr PutChar4x4 ;type empty pixels as well! adw LineXdraw #4 @@ -1477,10 +1480,6 @@ EndOfTypeLine4x4 .proc AreYouSure ;using 4x4 font - ;save vars (messed in TypeLine4x4) - mwa Xdraw xk - mva Ydraw yc - mva #4 ResultY ; where seppuku text starts Y-wise on the screen ;top frame @@ -1510,7 +1509,7 @@ EndOfTypeLine4x4 skip01 ;clean - mva #3 dx + mva #3 di mva #4 ResultY @ mva #1 plot4x4color @@ -1520,23 +1519,16 @@ skip01 jsr TypeLine4x4 adb ResultY #4 ;next line - dec dx + dec di bne @- - quit_areyousure - ;restore vars - mva yc Ydraw - mwa xk Xdraw rts .endp ;-------------------------------- .proc DisplaySeppuku ;using 4x4 font - ;save vars (messed in TypeLine4x4) - mwa Xdraw xk - mva Ydraw yc mva #20 fs ; temp, how many times blink the billboard seppuku_loop @@ -1564,7 +1556,7 @@ seppuku_loop ;clean seppuku - mva #3 dx + mva #3 di mva #4 ResultY @ mwa #lineClear LineAddress4x4 @@ -1573,16 +1565,13 @@ seppuku_loop jsr TypeLine4x4 adb ResultY #4 ;next line - dec dx + dec di bne @- dec fs jne seppuku_loop quit_seppuku - ;restore vars - mva yc Ydraw - mwa xk Xdraw rts .endp ;-------------------------------- diff --git a/weapons.asm b/weapons.asm index 47c428b..1f72fc4 100644 --- a/weapons.asm +++ b/weapons.asm @@ -102,14 +102,7 @@ VOID jsr xmissile ; soil must fall down now! there is no other way... - - ;first clean the offensive text... - ldy TankNr - mva #0 plot4x4color - jsr DisplayOffensiveTextNr - ; hide tanks or they fall down with soil - lda TankNr pha mva #1 Erase @@ -186,10 +179,6 @@ EndOfLeapping mva #21 ExplosionRadius jsr CalculateExplosionRange0 jsr xmissile - - ldy TankNr - mva #0 plot4x4color - jsr DisplayOffensiveTextNr lda TankNr pha @@ -1832,8 +1821,6 @@ EndOfFlight jsr unPlot mwa xcircle xdraw mwa ycircle ydraw -; mwa XHit xdraw -; mva YHit ydraw ldy SmokeTracerFlag beq EndOfFlight2