From 3b80de7def625a067184d192686c3bed1652a319 Mon Sep 17 00:00:00 2001 From: pkali Date: Tue, 17 Jan 2023 09:25:01 -0500 Subject: [PATCH 01/16] readme updt --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 52d8ca2..266ee5c 100644 --- a/README.md +++ b/README.md @@ -58,8 +58,8 @@ Y2K Compliance Edition This version is 5200 SuperSystem focused. - the correct production year in the splash screens!!! - very rare hangups when accessing the inventory seemingly eliminated, thanks @RB5200 for testing! -- a new feature - pressing [Tab] (atari800) or [5] (5200) when selecting the wind power switches wind mode to changing with each turn, what makes aiming arguably more challenging! It is indicated by "?" next to the "Wind" in the main menu. -- all these changes were made possible because of the extensive code size optimization by @Pecus +- a new feature - pressing [Tab] (atari800) or [5] (5200) when selecting the wind power switches wind mode to changing with each turn, which makes aiming arguably more challenging! It is indicated by "?" next to the "Wind" in the main menu. +- all these changes were made possible thanks to the extensive code size optimization by @Pecus ###### Version 1.23 From 79b5bc32908c389efe05cae5ea3677f6e44b7158 Mon Sep 17 00:00:00 2001 From: pkali Date: Tue, 17 Jan 2023 10:04:09 -0500 Subject: [PATCH 02/16] readme updt --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 266ee5c..c7da788 100644 --- a/README.md +++ b/README.md @@ -59,6 +59,7 @@ This version is 5200 SuperSystem focused. - the correct production year in the splash screens!!! - very rare hangups when accessing the inventory seemingly eliminated, thanks @RB5200 for testing! - a new feature - pressing [Tab] (atari800) or [5] (5200) when selecting the wind power switches wind mode to changing with each turn, which makes aiming arguably more challenging! It is indicated by "?" next to the "Wind" in the main menu. +- pressing [G] during the game changes the color scheme (classic, Polish rainbow, Xmas). - all these changes were made possible thanks to the extensive code size optimization by @Pecus From 4088e5f8fafcdf3e041a047ef140085db8003241 Mon Sep 17 00:00:00 2001 From: Pecusx Date: Thu, 19 Jan 2023 19:46:06 +0100 Subject: [PATCH 03/16] Macro "wait" optimization, and better credits --- constants.asm | 7 +++++-- lib/5200MACRO.ASM | 25 ++++++++++--------------- lib/MACRO.ASM | 25 ++++++++++--------------- scorch.bin | Bin 32768 -> 32768 bytes scorch.xex | Bin 49301 -> 49294 bytes 5 files changed, 25 insertions(+), 32 deletions(-) diff --git a/constants.asm b/constants.asm index 7f79453..4184ed3 100644 --- a/constants.asm +++ b/constants.asm @@ -626,10 +626,13 @@ CreditsStart dta d"Bocianu, Probabilitydragon, EnderDude",d","* dta d"Beeblebrox, KrzysRog, lopezpb, Dracon",d","* dta d"brad-colbert, archon800, nowy80",d","* - dta d"Shaggy the Atarian, RetroBorsuk, ZP",d"H"* + dta d"Shaggy the Atarian, RetroBorsuk, ZPH" .IF target = 5200 - dta d"x-usr(1536), Aking, JAC!, phaero",d"n"* + dta d","* + dta d"x-usr(1536), Aking, JAC!, phaeron",d","* dta d"RB520",d"0"* + .ELSE + dta d" "* .ENDIF dta d" "* dta d"Additional testin",d"g"* diff --git a/lib/5200MACRO.ASM b/lib/5200MACRO.ASM index 2662deb..1bfddf2 100644 --- a/lib/5200MACRO.ASM +++ b/lib/5200MACRO.ASM @@ -74,23 +74,18 @@ .ENDM ;------------------------------------- - .MACRO WAIT + .MACRO WAIT ; WAIT ; waits one frame (1/50 s(PAL) or 1/60s(NTSC)) -?zero LDA VCOUNT - cmp #$05 - bcc ?zero - cmp #$70 - bcc ?WA - sbc #10 ; last lines correction -?WA cmp VCOUNT - beq ?WA - bcc ?WA -?WFRAME cmp VCOUNT - beq ?nowait - bcs ?WFRAME -?nowait - .ENDM +?ze LDA VCOUNT + cmp #16 ; if line<16 then wait for line>15 (long VBI protection) + bcc ?ze + sbc #10 ; last lines correction +?wa cmp VCOUNT + bcc ?wa +?wf cmp VCOUNT + bcs ?wf + .ENDM ;------------------------------------- .macro waitRTC lda RTCLOK+1 diff --git a/lib/MACRO.ASM b/lib/MACRO.ASM index 4dea932..34aa3ba 100644 --- a/lib/MACRO.ASM +++ b/lib/MACRO.ASM @@ -73,23 +73,18 @@ PLA .ENDM ;------------------------------------- - .MACRO WAIT + .MACRO WAIT ; WAIT ; waits one frame (1/50 s(PAL) or 1/60s(NTSC)) -?zero LDA VCOUNT - cmp #$05 ; if line<5 then wait for line>4 - bcc ?zero - cmp #$70 - bcc ?WA ; if line>=112 then - sbc #10 ; last lines correction -?WA cmp VCOUNT - beq ?WA - bcc ?WA -?WFRAME cmp VCOUNT - beq ?nowait - bcs ?WFRAME -?nowait - .ENDM +?ze LDA VCOUNT + cmp #16 ; if line<16 then wait for line>15 (long VBI protection) + bcc ?ze + sbc #10 ; last lines correction +?wa cmp VCOUNT + bcc ?wa +?wf cmp VCOUNT + bcs ?wf + .ENDM ;------------------------------------- .macro waitRTC lda RTCLOK+2 diff --git a/scorch.bin b/scorch.bin index 98e037c8e72847facd8a855e8a90ebf963ce309b..bc45a0e6c0ffb315e490b8fbb099ac370e8db7a7 100644 GIT binary patch delta 6883 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 diff --git a/scorch.xex b/scorch.xex index 9f426aa24ceb9d546447b6513a4ee47fc747bcfc..030463b230838055792725eef902bf9b56425a73 100644 GIT binary patch delta 7314 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 TZL{Fo-gbuk;M2?Z*y;ZRhZCw- delta 7286 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 Date: Fri, 20 Jan 2023 11:00:46 +0100 Subject: [PATCH 04/16] The tanks talk to each other again. --- scorch.asm | 2 +- scorch.bin | Bin 32768 -> 32768 bytes scorch.xex | Bin 49301 -> 49301 bytes textproc.asm | 42 +++++++++++++++++++++--------------------- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/scorch.asm b/scorch.asm index 9389a8a..7c5c601 100644 --- a/scorch.asm +++ b/scorch.asm @@ -15,7 +15,7 @@ ;--------------------------------------------------- .macro build - dta d"1.25" ; number of this build (4 bytes) + dta d"1.26" ; number of this build (4 bytes) .endm .macro RMTSong diff --git a/scorch.bin b/scorch.bin index 98e037c8e72847facd8a855e8a90ebf963ce309b..7ddc409650dad3de7ffd62a9026ba5351f1a1098 100644 GIT binary patch delta 74 zcmZo@U}|V!+VGT(QEc-wwp?~b?a3j0ra-cbuK-B?=96U9-Ym*5CNX)Ry5?kU^~sZ; ZtE)4HZ06S}QUb~}dF^KdQci*U^Z;#a7kdBz delta 74 zcmZo@U}|V!+VGT(QFQY&wp@0`eUn4@Oo3zY)Oi5gh| diff --git a/scorch.xex b/scorch.xex index 9f426aa24ceb9d546447b6513a4ee47fc747bcfc..accaf03cc3a2f47902eeaee82ea27cc71deae432 100644 GIT binary patch delta 94 zcmbQ*$UL=?dBZPvMzPJm-PPC`4JRx4n*zxQ{{m^l^fh53OS4;xTe20bN|qM4W&`;v w8Cq{C7;b*-pDZ!?W`^cuw~Wb?nKIQGqc&@0PF7+x+`O-QKO2y$n Date: Fri, 20 Jan 2023 11:05:12 +0100 Subject: [PATCH 05/16] Binary files upd. --- scorch.bin | Bin 32768 -> 32768 bytes scorch.xex | Bin 49294 -> 49294 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/scorch.bin b/scorch.bin index bc45a0e6c0ffb315e490b8fbb099ac370e8db7a7..7ea6cadf6563e45d8ed04352e309e7c89dce7c17 100644 GIT binary patch delta 74 zcmZo@U}|V!+VGT(QEc-wwp?~b)yW}zra-cbuK-B?=96Sp-7Ly4ATfD|y5?k6^~sYT Zs;e{lZRXS{QUc1KSpA5M#kjH_8FR!e`lyOYHe1|oUFvSck}k{{cJ$0e3G~x036^Z=l}o! From b18793014df59d621a2474c9fd75809f51ed2aec Mon Sep 17 00:00:00 2001 From: Pecusx Date: Fri, 20 Jan 2023 14:40:54 +0100 Subject: [PATCH 06/16] Very rare distance measuring bug fixed. Sometimes a perfectly hit tank still lived. --- grafproc.asm | 7 ++++++- scorch.bin | Bin 32768 -> 32768 bytes scorch.xex | Bin 49294 -> 49298 bytes 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/grafproc.asm b/grafproc.asm index dc7b807..dcb1b89 100644 --- a/grafproc.asm +++ b/grafproc.asm @@ -140,8 +140,13 @@ LineParametersReady ora DX+1 ora DY ora DY+1 - jeq EndOfDraw + bne NotOnePoint + ; length=0 + sta LineLength + sta LineLength+1 + jmp EndOfDraw +NotOnePoint ; here we have DX,DY,XK and we know which operations ; are to be performed with these factors when doing PLOT ; (accordingly to given bits of 'HowToDraw') diff --git a/scorch.bin b/scorch.bin index 7ea6cadf6563e45d8ed04352e309e7c89dce7c17..aff0117031401d06583d7b42997ec6cac74221ac 100644 GIT binary patch delta 4164 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 Q@}{Gzb9Lt2ZHLDG7ZX$mo&W#< delta 4271 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 UpY?XyE(s@m&hIzoK6}LDf8~}wVE_OC diff --git a/scorch.xex b/scorch.xex index 545699b92c1db2eec9fd0aa577c6d9510dd2839d..21236d11632bb407ffd365772aea19530fb89095 100644 GIT binary patch delta 4347 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 Date: Fri, 20 Jan 2023 21:26:39 +0100 Subject: [PATCH 07/16] Second fire (shift) on 5200 Thanks RB5200! --- scorch.asm | 6 +++++- scorch.bin | Bin 32768 -> 32768 bytes 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/scorch.asm b/scorch.asm index 7c5c601..eed14d5 100644 --- a/scorch.asm +++ b/scorch.asm @@ -1457,7 +1457,11 @@ EndOfCreditsVBI sta stick0 ldx JoystickNumber - lda trig0,x + ; check shift key (5200 second fire button) + lda SKSTAT + :3 lsr ; third bit + and trig0,x ; and first button + ;lda trig0,x sta strig0 ;Move hardware to shadow mva chbas chbase diff --git a/scorch.bin b/scorch.bin index aff0117031401d06583d7b42997ec6cac74221ac..c478ec6d9b8315274e2385b3ede0991375dfc163 100644 GIT binary patch delta 7596 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 I*9UO_2UTC}wEzGB delta 7359 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 From da4d82cca4a8c0c28c27dab3df36416663a93c45 Mon Sep 17 00:00:00 2001 From: Pecusx Date: Sat, 21 Jan 2023 13:51:26 +0100 Subject: [PATCH 08/16] All the splash text is swapped. --- constants.asm | 8 ++++++-- scorch.asm | 14 ++++++-------- scorch.bin | Bin 32768 -> 32768 bytes 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/constants.asm b/constants.asm index 4184ed3..1c51797 100644 --- a/constants.asm +++ b/constants.asm @@ -644,9 +644,13 @@ CreditsStart dta d" "* CreditsEnd .IF target = 5200 - CreditsLines=37 + CreditsLines=38 .ELSE CreditsLines=42 ; 34 in reality. add 7? .ENDIF - +.IF target = 5200 + ; Atari 5200 splash + NewSplashText=* + dta d"copyright 2023 atari" +.ENDIF .endif diff --git a/scorch.asm b/scorch.asm index eed14d5..82e9658 100644 --- a/scorch.asm +++ b/scorch.asm @@ -274,14 +274,12 @@ rom2joy ; modify the text splash_text = $3c80 ; '.scorch.supersystem.copyright.19xx.atari' splash_year = splash_text + $1e - lda #"2" - sta splash_year - sta splash_year+2 - lda #"0" - sta splash_year+1 - lda #"3" - sta splash_year+3 - + splash_copyright = splash_text + $14 + ldy #19 ; 20 characters +@ lda NewSplashText,y + sta splash_copyright,y + dey + bpl @- ; splash screen delay. maybe add fire to speed up? @ cpx RTCLOK+1 diff --git a/scorch.bin b/scorch.bin index c478ec6d9b8315274e2385b3ede0991375dfc163..16c7f8701c441d27c5d6d228f65f5158524ab26c 100644 GIT binary patch delta 7699 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 delta 7697 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 Date: Sat, 21 Jan 2023 22:48:46 +0100 Subject: [PATCH 09/16] Visual Debug :) added --- grafproc.asm | 3 +++ scorch.asm | 3 ++- scorch.bin | Bin 32768 -> 32768 bytes scorch.xex | Bin 49298 -> 49325 bytes weapons.asm | 19 ++++++++++++++++--- 5 files changed, 21 insertions(+), 4 deletions(-) diff --git a/grafproc.asm b/grafproc.asm index dcb1b89..b9fd115 100644 --- a/grafproc.asm +++ b/grafproc.asm @@ -224,6 +224,8 @@ PutPixelinDraw bit drawFunction bpl @+ inw LineLength + bit Vdebug + bmi MeasureVisualisation jmp ContinueDraw ; was `bne` - not good, because LineLength starts from $ffff @ bvc @+ @@ -271,6 +273,7 @@ CheckCollisionDraw StopHitChecking jmp ContinueDraw @ +MeasureVisualisation jsr plot ContinueDraw diff --git a/scorch.asm b/scorch.asm index 82e9658..efe486a 100644 --- a/scorch.asm +++ b/scorch.asm @@ -27,12 +27,13 @@ icl 'definitions.asm' ;--------------------------------------------------- -FirstZpageVariable = $5A +FirstZpageVariable = $59 .zpvar DliColorBack .byte = FirstZpageVariable .zpvar GradientNr .byte .zpvar GradientColors .word .zpvar WindChangeInRound .byte ; wind change after each turn (not round only) flag - (0 - round only, >0 - each turn) .zpvar JoystickNumber .byte + .zpvar Vdebug .byte ; "visual debug" flag ($00 - off, $ff - on) .zpvar xdraw .word ;= $64 ;variable X for plot .zpvar ydraw .word ;variable Y for plot (like in Atari Basic - Y=0 in upper right corner of the screen) .zpvar xbyte .word diff --git a/scorch.bin b/scorch.bin index 16c7f8701c441d27c5d6d228f65f5158524ab26c..4d658662d457c743bc9ad1610cc8309deaa0e168 100644 GIT binary patch delta 4462 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 delta 4488 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 VT`=~%6Rx-vDd7^$)utKB{|921!_xo& delta 4709 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 X@Sh~c Date: Sun, 22 Jan 2023 19:46:37 +0100 Subject: [PATCH 10/16] "Debug" for Laser --- scorch.bin | Bin 32768 -> 32768 bytes scorch.xex | Bin 49325 -> 49333 bytes weapons.asm | 9 +++++++-- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/scorch.bin b/scorch.bin index 4d658662d457c743bc9ad1610cc8309deaa0e168..dd80a2dfc463055fd31ddd90cc8f95ae7e01a82d 100644 GIT binary patch delta 1487 zcmZuw4NwzD6lN15mtQ1f<1y1mrIuAW^JXkysJbN>#L;wa^gB z3gIW`DC9Dnt%@GC!(gzE8Vzcj)}pP$j2*{eR4k?KV5=6|J?yldj(an2cfa@D+i%~# zS6eHntrc`1bpyN6F}L|38Qpe!%P+)0?pML*jl3N)uugQNRB?+qrx_JU;WIAYT|t0g zPUFuCfHx-&ybS_XMwr+Ji%U0ju})MoxxCaK>F{AAD7qyLVxLnR5(Je1id!3WN9a*w zq0U%GEfn{Fx0Ti!Ed7#KKZd5^jcXJ<~tt z&bm{lU^yyHi~!~6P+|t~ML#4e0<_K8DPctv%}OvKma=s_bXd(j=Gd4J4xyl>JwVHS zw^R-!+GcWsV*M~nizbq4fEK-%d=1;wlo%QIWqrtc;3xsqDTnLSYBA5`^eOGYeYgpq zB09PbZphGJY(Z)mz>3$tDH4E#+=jG^0C=Mar9ZYSl&eJEijrt&WKrf}jT6du!7ij- z@j&3BNBQLH$jV0Ms!l;Lc3m*RT+@XT%yr#sgrYgxD*_UPv!aBMFkNHL%sqz?2BW)V z48E>MdZdKZO+jEM8Gx3j=lXorz~55QObE%!2BzP^Py8C4O^!*)`&4`+98M#A)9qg6&=u0OJ6>=FnXQEFx=(4&e>A25s#WG-^n z>q$Mjlvx7woMNR5m|0;M7$Ba)_?(U%=F4m@WrG!HNmd{}K$A7gWup;ZYJs!R?yOgU z12tuZV|yVh6s$q2Y#9<{CrM@^EW8VrRkJ*n>^ahGDaTo-t+7(Omm}~Iy9eoWWT-DY z+OO#_c@;6TFsWTS=F-)>a1}X>7&*S`l*2VA5~QHmoW;I-53@r2bRBfQ7nE#;-*3X| z;Eg8IgrxWBWDEA;v%iDR# zb(&E}OEu8jpiUHRGp6-cqh;zaMZ58wk!*2mjcwiE`c3P8;|cMI-TBZ{yLsHrR%G)NvpdJyxs5RW$5rfp=SAB1+Gn1I+0Cd_V6hTC=fo=e{~aTZgB7cKF;y z$x3($oy;$A!Q5G`WHxdynC&^WW}R>+eSBF8sWw=Jk_(~&>S+74ZV_(KdMxoJoI?ds zb6&z(_fMRo&Tt#ebkY@4#!PRO!aDB90wEC9wL>Qp8ebJoJZoFP3_cW5gSfM*c`&*# z1k6Y3!Z6WiZTy}p3@7T^eVD;_{zLkrFvR0>`vRsD|Jm6su$gUxWCi-IFfiV?-cqg+ zA0HU7zF|tU&NZcJl1zQ3dnO4jp_kxKLTkFHN~KasZD|R^PyIaCyk+72ys@>ohO>({ zClr}jXKFj2Zh+G*?H-3kCfjz$sK!#xgMk=){cn(+_Ak+&$IxVvT*lLhQR@t;`2XIR zVmU4&vRDRExb?+u)AyK9oIZd3<`a2HT#9mKX;mHSx!`yv@S2;XTD?nW{N&5~S=PzEl zJ|>@&wfR8n@v}GYOa`kqeNcbm_D>VOaA8_W4gF#q;RpJ4y*F|x3j>{8OxYE|nT;of ipaY$%IP7X*sb84iWeBa%%3LfgeMH{d$CYcFJpKZFJ96Ow delta 1626 zcmZuw3rtg280NH8YfHHo)@=nXo+`?ag6JFw=Z0znEY8H8oBZee|Nq_Zf1OiS z#w#o1^|VO9`>0j&4hTfoBwOWfb?T3!;GeZtIbO%w(Y1v8_hg@Tibud1F38cH1aeO6 z#`1uK6Dh6%MW_M#H^H6hd%IXWO0N!2w|I}qSS3X_hC%FmWJJ8Bsi2fgTY8=ERM<(K zGyl>_ad)kogyZqoo_pgADG6 z4X!|(p;tepSUE;zpr;!TgA7!>X#~qHn^(DDUu*^Igjp6--D5)AX}uN6)ogACj*|^I zilAjT+#9XMwzXS40nRurRKNpe+}^Ou07#Hh<%VU1Dj7JTld1%qABflwicvwtUEcF* zv_t)#XLcohU>8|%Bm5}rmGhNg6%*`=Al%qT9Rk%!-NN;h7 z&SnB7>V;@qWW4N~YHM}wdXlfsu4ekjtef?W`XiOXebts_(^h3Bat#PU9#M&49F;{y z0xxtm${)*l(dD?S$D-FQkQ>Y{B*wmhu11&go*YM!F&?fJHD)`K(wYS%wTl^{(wI>y z9f#|Olc+i-(7vKZU4cepQb7f$+%_M)wx@1*n0yR_;@S>%46yOkAl!pOV-c9WcjAsDiTx!k^b3(84qW>}!OCQQMhQJwUYCeUkJ005QG9>`P3`;Si!@y}%H% z#Cm`vbU!v(EJiqX7tAbTt-1@^x82kEmcBCw&xkhr5f-ns!cMfROECKnbPvZ}K&;yM|luN@?jqq9{^hfcDK5v^EsR>r8E0(fAS0ZKm zbcdxZPj^JxnFCM9!dzOLT~Jb9S=ZF&?7GBjb>Joy>_Zn4lZ2RqFsdUO(NvkimU%q_{P?SI@~>j(wM_fH)hH&(6@8gR`1}ug_Y1}rdzeo% z?Q|Z&bkKzaEazsE_&`wJ3?DV4r^#OAOw(Fs;+_B(BcO_`#`$W$yj57@$9Gk+EwHg)JxZ+%T<{l)V7@&`R<`Sbob$-%(r)D zrLt8UG==osI$>QRo3sgJpScG4XA<1j%w8V4ktIBreTEO3Po;o8e_Ir$Av{{R`vzCHi| diff --git a/scorch.xex b/scorch.xex index d2a8fff28a27c571220c98fac22a18d55f8aa4af..8004ff67b0c864cda781c1e151896ed382a0e607 100644 GIT binary patch delta 1540 zcmZuwYfw{16wc;>7?c|@RtSYG6booXd^eVg^r1X5GUNL-B?zM^Iuwu!3JSu-2P7fc zz|HHX6bR;`80wv>v|OhB0d1g<3{$LDf1q_bU>zE4QK+?cL#@tq+?_f1o^!tQ?b&nA zc2o*JtrT<)uLpmyx7Qo|fE^v)uoCP;=QpH;uQRCL-2lU;hHmc@iyBB#v7zIh2QhdJoXgFI9+S%kB zzA&h%jl9IoIY+W1K3T{$v72+-MVRU7AyxpyEL(6+46d-d%H9EB75hzo3QeQm}1DR?o2oyJBW>HfPjLlF(1G}*%4&X$}PR-y0CtH2y763|= zRU3h2MeR<}+~~{%A-Y++6(7B{?gK!hmbwuTgX%PynD)LVL@HH4i9{HkDG6{my+X$w zj{v43sdfpdMeDSS0uE}XO;1WyN$9wCOUQ3pT(vvVjS_*%pmp?kd>`LG`cOp|vRRimh*gdaz^3GWPN*AF{X{>F}KJ}%L;E4g729@+ecw_bG^839Q%&GdFD z^ecjc2XXpvyg|hwO!alc1u%h%8~25EG%$c@fl zmpYBBX{V6?0!l*@YN$j?(^`?0O6jtom^{j1)5QrWwG2vyZt&v_|ewlT@X-5lvh;X#hMFe!QF;)Q( zx~%ve$J-Qy-1>%NXjFu6AR>#gZNDuB>_mE7obV?LR(mkSWesr*?SBE8vc&}5!(lBr ztfiCR*V;FPCwd7T`DS8mTb^3n-rvt{x215~Y$@u!wqe^0Isxx&yc1}(lPpY2OCt+R zad-k6x3m^0Pi*z>QBg=k=dZ1_F+%c)uLl74fasinmA1Yko-sU&K4T;{E_h~S{9XVf z{sW?X`zxWo5Xl%fixB@0f%5FKu-xZf@iRXUvqH>}%Qo3(&phECymohdGAt>5cW(ZN zr_HXbH-4Fr$0)b$Evjn1)b06wrYt`F07-v&Yl?_YPCr&>{LKCHTD)eEM2ik>1%k_?I*)`MviK zRX5So%RaqWg;V7RzCxuJjj>l4@_}PA^eRI?lyQABZ=@S|WSm_VQvRJRq`O~MI>69& MS=TVT!c`LV4VW(D|BC2Pjo8%mOX# z4}H;#Sh%#84e7kPjAUgo2Daj|Rg}$TW&^WibW_*q+;rJ=r?|~z+qubq&iVfD|NfKj zo^w$x>{kn26RXi}esZ-zf{gG+aV9E*w~LDus|?B)igCnrd|=>$7(JEvx$FbgT>*vX z^0Ja-87km&$_4}|o%fZ0fpC=xZ?od0id{}Fh&C!CDm-c4XfBmz%te8m0wyX{$j;|i z3PfS%Ui!Q{#6j~@fq2ku<~Qu>6BDH;dwC%e@caQsFdE>u))XSNgg;XoD?m~hI>FD% zZeoZ0pI|LMv%nwNBEpgsoX5u4p|OaHw_V%zTqOMn;MKwejMH$rA zUoRl8Os8IKPb0VUNPF&lri~NQ3}+j7lBB5+uuQVpw_r^9^1|# zn!{@kllB}wS<0UEg!_e9YQjEvVpNddr7*okjO#VQj095)L#c2&mrrqX+mQu@E%a4|`rvBhDkEr#LC)D*I<*{?{De;;)0RjAC&O)WI*z$6)p21hm z_;)kj20F`PbP0wmiaB~l_1eKVPihQSd$>Gd(X!bVRe`yPr`IlN5G~ly#G`ZkJ%BXJnjQ;2b7CKD(*6N)_BUI_h3$D{`0E zid5TeH*8OA$xJe{m3+xi&BP!bv@`ow9da_0hIJOLN} z1#*&S#Ml4^d7bi%09|(1J&OwdS9TgFG9t4=DV(!X35kgV%qO&d(`4RNs95(pUFqrln`) zDPP*KrL5ZS9Jnw%G3A%U;H3QWJ;%?S^WL~Q@vU!m*4ll|-S2&L&HwAXf~wP9&e5M| z$#Zfyy;@^trbp-W;4_>`3HlJ!=h|iraP&R)VT=nD12NLe9MdTuyus%V91Z&u%cO^; diff --git a/weapons.asm b/weapons.asm index bdf9023..676c780 100644 --- a/weapons.asm +++ b/weapons.asm @@ -1458,8 +1458,10 @@ AfterOffensiveText cmp #ind_Laser__________ ; laser bne NotStrongShoot ; Laser: (not)very strong - invisible - shot for laser beam end coordinates + bit Vdebug + bmi @+ mva #0 color - lda #1 +@ lda #1 sta Force sta Force+1 mva #$ff LaserFlag ; $ff - Laser @@ -1755,7 +1757,10 @@ LaserNoWalls bit TestFlightFlag bmi nowait bit LaserFlag ; faster laser prepare - bmi nowait + bpl nolaserwait + bit Vdebug + bpl nowait +nolaserwait lda color beq nonowait ; smoke tracer erases slowly lda tracerflag From ab302278435f645de4ff6fd30c47b1d79fec3fbd Mon Sep 17 00:00:00 2001 From: Pecusx Date: Sun, 22 Jan 2023 23:17:26 +0100 Subject: [PATCH 11/16] Ctrl+HELP - new "debug" switch --- scorch.bin | Bin 32768 -> 32768 bytes scorch.xex | Bin 49333 -> 49333 bytes weapons.asm | 18 ++++++++++-------- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/scorch.bin b/scorch.bin index dd80a2dfc463055fd31ddd90cc8f95ae7e01a82d..07e81050707bef5e570686da06c8e1cde2b810c3 100644 GIT binary patch delta 16 XcmZo@U}|V!+Hlo_v1{`+4=r;5I9vvg delta 16 XcmZo@U}|V!+Hlo_v1ju&4=r;5IA{iu diff --git a/scorch.xex b/scorch.xex index 8004ff67b0c864cda781c1e151896ed382a0e607..d277f07c73498908b35236b8b2b63a76256cef11 100644 GIT binary patch delta 44 zcmV+{0Mq}qfdjRH1F)uv6UmX#38i02|Ak*nh>9sc$qw*gldOp{lk15d0g4_i#ld}qnt2Ur0 B66*i} diff --git a/weapons.asm b/weapons.asm index 676c780..be8e5b6 100644 --- a/weapons.asm +++ b/weapons.asm @@ -1166,8 +1166,17 @@ NoSpyHard cmp #$80|@kbcode._tab jeq CTRLPressedTAB - and #$3f ;CTRL and SHIFT ellimination jumpFromStick + .IF TARGET = 800 + cmp #$80|17 ; Ctrl+Help + bne NoVdebugSwitch + lda Vdebug + eor #$ff + sta Vdebug + jmp ReleaseAndLoop +NoVdebugSwitch + .ENDIF + and #$3f ;CTRL and SHIFT ellimination cmp #@kbcode._up ; $e jeq pressedUp cmp #@kbcode._down ; $f @@ -1185,13 +1194,6 @@ jumpFromStick cmp #@kbcode._S ; $3e ; S jeq pressedS .IF TARGET = 800 - cmp #38 ; / - bne NoVdebugSwitch - lda Vdebug - eor #$ff - sta Vdebug - jmp ReleaseAndLoop -NoVdebugSwitch cmp #61 ; G bne EndKeys jsr SelectNextGradient From 41094db7dd8b9f5e9189467da7026631ec0d13df Mon Sep 17 00:00:00 2001 From: pkali Date: Sun, 22 Jan 2023 22:46:47 -0500 Subject: [PATCH 12/16] wait by atariki --- lib/MACRO.ASM | 9 ++++++++- scorch.xex | Bin 49333 -> 49324 bytes 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/lib/MACRO.ASM b/lib/MACRO.ASM index 34aa3ba..611e46b 100644 --- a/lib/MACRO.ASM +++ b/lib/MACRO.ASM @@ -73,7 +73,14 @@ PLA .ENDM ;------------------------------------- - .MACRO WAIT + .macro wait + bit VCOUNT + bmi *-3 + bit VCOUNT + bpl *-3 + .endm +;------------------------------------- + .MACRO WAITer ; WAIT ; waits one frame (1/50 s(PAL) or 1/60s(NTSC)) ?ze LDA VCOUNT diff --git a/scorch.xex b/scorch.xex index d277f07c73498908b35236b8b2b63a76256cef11..acf4de11cc805ec5ad79b5e664f800476ea3b0e2 100644 GIT binary patch delta 7232 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 delta 7383 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 F{{n0twTl1% From b7560ab6d9462776aecac05d8bc6b42864281983 Mon Sep 17 00:00:00 2001 From: pkali Date: Sun, 22 Jan 2023 23:03:10 -0500 Subject: [PATCH 13/16] minor fixes --- artwork/Scorch50.asm | 2 +- lib/5200MACRO.ASM | 9 ++++++++- scorch.asm | 2 +- scorch.bin | Bin 32768 -> 32768 bytes 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/artwork/Scorch50.asm b/artwork/Scorch50.asm index fd231d5..216e32b 100644 --- a/artwork/Scorch50.asm +++ b/artwork/Scorch50.asm @@ -760,7 +760,7 @@ quit ini main ; --- - opt l- + ;opt l- ; this stops the listing .MACRO SPRITES missiles diff --git a/lib/5200MACRO.ASM b/lib/5200MACRO.ASM index 1bfddf2..a82cfd9 100644 --- a/lib/5200MACRO.ASM +++ b/lib/5200MACRO.ASM @@ -74,7 +74,14 @@ .ENDM ;------------------------------------- - .MACRO WAIT + .macro wait + bit VCOUNT + bmi *-3 + bit VCOUNT + bpl *-3 + .endm +;------------------------------------- + .MACRO WAITer ; WAIT ; waits one frame (1/50 s(PAL) or 1/60s(NTSC)) ?ze LDA VCOUNT diff --git a/scorch.asm b/scorch.asm index efe486a..62b3532 100644 --- a/scorch.asm +++ b/scorch.asm @@ -182,7 +182,7 @@ FirstZpageVariable = $59 _atari = $fd ; not used in 5200 _none = $0f - .ende */ + .ende .ELSE icl 'lib/ATARISYS.ASM' icl 'lib/MACRO.ASM' diff --git a/scorch.bin b/scorch.bin index 07e81050707bef5e570686da06c8e1cde2b810c3..b941430172153dc20ccfbd160c3cc31cfee96213 100644 GIT binary patch delta 7159 zcmZ`d30PBC)_Dm#AukG6c5V|MV#*Marv8FPef`%EL^l!B@oz|~zjEt>+w6<2~8~x9H!EL4!_}+W>+;h)4_uO;O zR#GA_DUqMN=HpkCEb`R_h}Bs9+tSHhp8-rG>FYa>Nhevp)1%UpQT{UYf6LLZq~$EI^eD(J%8*BKebVtoOBi(H8->YM=7tYsS^w;n{aZwb&1vxzA^d9&`qi zP9^6zZyV~Lk7_m{T|VkZBK(3u0F+XU^xM#}P3Sh6;WyLRp38kcx5?UN)3Q!4TP^EU zpu&A!YA3p#-?YZ&&SHHFOgR+XjyJ`p_#1R*mB`@cCcSNS3RayTrOElueRMPq84 z^e{kA76@T>ABO^^>z9}&yP^xC_k~HA?;{h>os+xJSchtED%9A zW+X2_G3($@Lp29^ypoi9i539D#nD*oFOo zmfA9~VLqx$7OaWZ_GFV@Y3)chtx<{|*b2;^nL!a8J?IDt3(SiHy3`NhoO7{Nl$jK) zu-sIM&<^q>G|YH+nO*MiyQE;%Ur2Kt0NfmXjw{%!ywb)i)n}gYN(%IF_yZ6I0JOV1 zj>0qr|I@+nFjOFZISj1|)~;}P3d?6j;N^T{+J$z7LvE4nNNam51utzYNWsf^QH>2E z!uhb10+AdD^9lZLdAqmcL7-sB^TCEHd3U}=CT#eQSEBF8r(wH>OM7gS_Q=B`J-z|9 z1g7YLLJx5p(j}t<_ziSC9qfnUQ8C#RK7eT_2g8Gna1ltlSZ1275(7+}3ijBb7N44q zs4e-D66x`b17)i~*&6IAhD6;^%f&FbTfL@Fl@2>l3wj?PpBCE?WqqXT_JwvY$AiZ7 zw$e0HoJ#DE&4ApO#qZmcEIuZV#Dzd_Bl{Eub#Q?mrK~{NKU1?FHBr-h$ty!J5 z;~cub0ySo#V+%oOPmuo#_sc@6NlwAT2}mzVxpKHNUe2+08Nm8y!a2~F<8y0+TJ6_) zP91*CqAuTYj{9K+47`sW?i~o{I=WBFaW|JmzK9s;c7FwYJdQ{hu`3Jsa#<^Y;W_$} zG!qD#5pIA&S7*JL+G(%}slcq9EJGUA^i+pOTVM9O!qk%#v-2o$pO zf^ea*GEas#+6n<|o1Th~!Tv2lqFZ$~_b* z#xqHzQ8U@CBg1MTCp5uC9vKq*B!iE-p*6%csI^{==i1h*x%f&M5Qkyb4%Rbbh6l1YjJYue8 zIT*(|0>wCNu1iGIYtg6!C^;*)8CKNLx%ijo9@e|&N?daZ4ll69^FV_H4TufDx5PY( zwLO>NRIRRusjdaH*xSLPw_7s@gfc_xl7X-ut6N-txi;Hn@)ak#^@6^`>i9bk7A@Tm zeA8A+jzz`BROZ0AjcumZx?N*C=la^EK@V2CtPgJRKSB8i_6;0uyqMjjf6~SRevHE0 z#yV$m7qh!>3ODWE;JRe^CJZ}asCE;*q=9fVFi(MDy2?|ysq69X1?qYLs0L7Ao(lw2 z&#}N8+=Dx~`g1H00(u98V24sTU=OPL1+h8YMe@aDD+h_fe{;br zxa8xQiOk33Va!NlKTwIJq+TkQi~(97;gqfiNO2u`6biBI6%n|8x#9x=CBG1wg4F+k z1vwI=7QKni(lu!A8tU1nf$vTN-~ALH7AKAb2OdRZHQq+Ur40LFH8$dO(Fdz6<0XF& zA+gdJV38d+20+r&vJ>(f^8Ju7?^~;L6D>>&Tp5qp1lY}}*a�#zy#q7aL$LNvk&G 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 delta 7000 zcmZ`d30M?I*7OYb)h(iOQy>r#ltYCf-l7Jz#e*Xr5r-oJ4j#jy5q}s2%K$nERsS$B35&A-{KyYb);nsvub)TqDuzv>~znEV{wUGJ**s$RYK z>Qz-e)vL`RBg zAOr5a$LdOiiqX5<(cEGbM1np1Kmn9hfl4dU``ghSve4rdjk$n7yR6GFXo_X6&ZZXD zDo2$E201IbQ`}W#a$vEl2T&F{zdKcYioZfX?wN z3Ri$BdsL>G)Q)l62D$IMD)y+3>R5|om+FviFZ+zE!vW0F%_Mt03;Y%NM>D;Fxn#Er z%_$X1unNXD>BN&wu%EaF^^g>{&au2gWKd84mn_4$G*pTqTK|vH>i%!IP?>LBDKLnz zHag^1g5o#Bmx!jPqc{>U+MjVFiqVIeB=VQht7F%tEBT{oXmuqpIBD&^5CS3{EcW6Y zd^wV_jyAY`Vdfei47>i(?Tf}o@aXMd>5UjhbEIU9lLi$7lUkgQi$xBXhzOU84{(_n zg0~^?ts(3nF2auDEbN3pJsE6JX{9)bJ%EYRhj*+%?dgIc#b8d?s@x41)3rtJq9Znd zDnB{N4sZ-uK_slyt@0k^?t>Q;V1sCN{~}d^{>%_*3-p2K`+;x9OC}g46O>?`3SR?90zY&_ z;ca|HmgI2&zlJ`@l9WYz$mXE&!R9RSTUfsZuzvoqex9&?b+CS(cpDE#qmA?i`PsLp zqt)bM&{)U(bn52hW)NcPiCb`>_n8f1HO>>g@#`IS4exRddJd(L8Nn#LBzN~|^k_XY ztWz> z^xctxaQfU(uM7|IMdW;Nxc#H`@Np+NW=dl&%)}S1hbd0eSG9JDr|6^QJ%wvveM#=m zs6A@au}qk(iKL+rO=_ma(dfngy)v^GK-qd9k!{M;2Z>x$o{x}MI2M-)uNT_kZNP)y zL$drXH3j=V16Kmrl$wc;qB9%xzM_3o9`BefF3^^FiYeM{p5htpO!_s;vrBEfk&au8 zx6<*UPIX@k)gW6xV~l9mlz0APWO*Q{(U=ze9u?30Bwm`(bTd;Aa>24|wlvCO6xb6%spnA_AMt)&my8ycIjDAzpM z;x0yEo!G8xVR;xwTYSW5tUHu~Qd`jMR^sLI+`oE!05iEg9R#Z|*JBH>`aGNS)*T;G3954j z%l|0huu7heubb-0k+7)9mJKjAvfak|HQJgG(`nn+n<41&>(5T=BiMr@WPsBhDf>2$XZ|FFXs(i7p}t*wuh;&!*BqGoW1BQ4TS4Hg>nq&MknFAV%TK_s2Bzy z2Oyt98wjMHW?^!(+~NQs`!oxJKwhihXK@!=&AyHIkk1DGGBJctXZ*-;c$ClM*N-0I zIwFkwLn1Y1)aYnd_R3u5{Cx|Fj(F93%bLUcL-rlvc%Ka&&Zf`PvD)-CX^BW;>d2oX z#=&zqB4S$In!}x3EqC3}$^Efz4V_op$>|wmC)ZR~%l)W4mf>yM*@aJ-Zg=7SZ|Sqx zw3Ez#Nnj$#&6g%H*<|#DiOe!GYXb7i*(mh+6x!oHaRojhX5fBwqCn`wU!rB?jR~QF z>z@G!8ZG})idFc(!MeXn6hY*J2`J@f0m;v3Z2~rma@;6V(Z7&#XQ0;dffDW8Ow%ev z^gf9?hXhCZYh?N2CXnKe`+qr8fi*RG{`;dZ~!p|);zb@L(1cB6R0q)4SA=RYVp&$>~nIuAMdACkfFJ%-dvLv@eu)+oO5Dv`DmS|I1U1)mC^a zJG1CnZT0L@eYBS~-ptgtd7AdJQcM)zv1KC~4pjhzT=ilw^dsz~8Don#{U$1V5|YXC zNzJ5*^mTmFiV3oO1C$EyiT`|F@Fo^wc?pY;ieHR?&yWd|=TaWkom&;cjvH#M6v}TDxX2?#C zzzlUc<(2bEWO<@5l;s-}gPd(LVKW;Olbx=W_vOu$XOgcHqesDQ%ML4XHqODhRF!hl zpa>;N3XgGPcK`;Uh}&s()7uF-O%+XQemhyGC=B3sS^{Bjy3w_AygcCvQnB+v2+6J~K8 zxF+sG?WB3;JTH9){!r*LuWfV?PbzM7^_cYJ=FFFv7~(Z+0&K_hS#e`FWngE+<_zp& z*ph)=4O=s?n?X%>&GKDwt62(Au05vTSEiWWuS`+08b1xvOw`0`iZm)sSk)(0=Bghm zf2jO&*Ogs2c9qxcuK8})yhu=2S6pWcl1M2yta|*N-2!2d?VJd3eFR^fd~!+T6@P#$w>e7r8%I={v55 z&TVg-+i(#)T;}RZ3CPxY{><;lzIlnvHF9>|lu_eq3VH^)s~0b_KnCfooH!?=MR7Y} z*^XOW#j)_T7lS3)kT`YVmObE@cIuI%X{UY`4|;^2bH^>$X)i%3&a`Q>lBkotoi{hb zl6CWIh&Gv?+Y`w;n0)#CG0btYVg6F)JUKakF+88n4~-r=2n+6@&qD>vlwjD;)AbBV z@*BU0u-X0Xo*qzvEM4Ho{D%}QK)_tLU@Cl{THvQ}E0ON~aD{d&=~5M7)gYL)5!>_{ z1t!@2WP(lOyY#3jAxv-!Q(Wl$mMFxOlkA1B_%P+d2^!IHws4Y0dYmgcOal3M;Yl#0 z?3G*%bS0!;B9386fQV9Xwkq*{Lha&B*GY>_|AXs?S8`xXsr|@;Q)_h-j z34xKPA*Q%PuLBD8L3)Q*Lhr-bHvUj)cCxsjo5g5P7N1cICH6!ZKw(2~rL<;%d7&F~ zM^haADGSrq9*~+hVB2NBpx#^!Qv}zUYvHw~&Wzy|S06dsEVE|7&0EgL)=AgOPwJ!# zWoaGwpq$@aFI_pk>dhW7T3&DVgqO0O|Nc$EH*aCNS=m%NlPxi95>dSh~k|>U#?EoDN zXp8*Hb7&v&>CzB)?c5M(n?RQhHVFWs?%GgysAH);u(Y@pJxr5sJaT?XE$vM-8(eRh z6M7$LGrXbuM0;oo(y+J?qSKFyw|Z9W1(F*Iag8ki|6_?iXMk@Vse6yV#3K4K8{flZt0|OUMpO+$idb5;C;f!;O1v=w&4d_=G=ucC#-oZ z#gV#&!Bc;I430uU=2W{cnB)J{06JWyuFn@Yz}cZM`c2+n8tuHj!5nU-gW;u98J+~C z#(0jLPPop}14`DW`iFkqEPB{B8>%8&6WI$o%DD_VRLmKPg&Hn>~1We2~2SSP-SzzaRcURY=C-r;zPw znI|tNmzIZ4^49>#uTT`m=zO^jdpe23AopV|l>!SA6aqM4ela#Y>klGNlDp!qg>yL5=pq?iLvoh3!!N=)`QYG|iVsp-_2(%4JX)oojEL zGGc^KW_D<#&8cpbFO^VN4D3)DY?g#@1xJmfB};x8KbrhRMFj>hVPs=k=orYXH19($ z(U}rhv$rMWrl=w9X?~7$K6H_sNgFdyiiOvp>19=#9j)V~xODI>{yZ58K~CK?{0tE( z{749pWz|6a+PTc8C-F%S2uywpN>H8X1!veYgHkMfo?=CMNWd-|MF&vO;0@6f`mKLF z$hQ$mDPM>~D2%+9?hoyvPt)f^?e3ltUad}3g! zJgH9P>kdjfjZ}yC(u8)imsJkS05gG)e4OD2DgJL6wcyTqnIzb;MXO_#aF?^Xd~9cR zkXk%S+Ag>CeaP5XC#>Aol42}tNzpqP+u?#|{2hyn7Zz_&(|@ed7bOXYbv}C*4L#7-@Vpl-Wl5UrmInkqVcc=?4!#lJjnF*-{Ot5$kSttlmC8F!dZ zBOa^$eV+%xI@+~LU8+`8O6IPP39i?f9eW+52s*;{OPc+wVfGB3;RtXZfl{$^;1a)y+*=#6HefGYom_hc2TfDjQcUq}DayHR ze`vef=B9Jg&4OPyow6GjFJ8PDs}Dtji$2QeR3}}}wC3=|ZNElb$+Rx&EH*+b?Y~lzI zI`hv6gD8wVe$CJKwYGun+-+!Sy1s~wUFXLnlO^kXxnzk(sSg_QqW;o#Pna3L5b=M6 wAAJc~vf0 Date: Mon, 23 Jan 2023 08:49:58 +0100 Subject: [PATCH 14/16] Revert "minor fixes" This reverts commit b7560ab6d9462776aecac05d8bc6b42864281983. --- artwork/Scorch50.asm | 2 +- lib/5200MACRO.ASM | 9 +-------- scorch.asm | 2 +- scorch.bin | Bin 32768 -> 32768 bytes 4 files changed, 3 insertions(+), 10 deletions(-) diff --git a/artwork/Scorch50.asm b/artwork/Scorch50.asm index 216e32b..fd231d5 100644 --- a/artwork/Scorch50.asm +++ b/artwork/Scorch50.asm @@ -760,7 +760,7 @@ quit ini main ; --- - ;opt l- ; this stops the listing + opt l- .MACRO SPRITES missiles diff --git a/lib/5200MACRO.ASM b/lib/5200MACRO.ASM index a82cfd9..1bfddf2 100644 --- a/lib/5200MACRO.ASM +++ b/lib/5200MACRO.ASM @@ -74,14 +74,7 @@ .ENDM ;------------------------------------- - .macro wait - bit VCOUNT - bmi *-3 - bit VCOUNT - bpl *-3 - .endm -;------------------------------------- - .MACRO WAITer + .MACRO WAIT ; WAIT ; waits one frame (1/50 s(PAL) or 1/60s(NTSC)) ?ze LDA VCOUNT diff --git a/scorch.asm b/scorch.asm index 62b3532..efe486a 100644 --- a/scorch.asm +++ b/scorch.asm @@ -182,7 +182,7 @@ FirstZpageVariable = $59 _atari = $fd ; not used in 5200 _none = $0f - .ende + .ende */ .ELSE icl 'lib/ATARISYS.ASM' icl 'lib/MACRO.ASM' diff --git a/scorch.bin b/scorch.bin index b941430172153dc20ccfbd160c3cc31cfee96213..07e81050707bef5e570686da06c8e1cde2b810c3 100644 GIT binary patch delta 7000 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�#zy#q7aL$LNvk&G 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 From f9fad89d7c66e582f0bd6df60809cade43003475 Mon Sep 17 00:00:00 2001 From: Pecusx Date: Mon, 23 Jan 2023 08:50:03 +0100 Subject: [PATCH 15/16] Revert "wait by atariki" This reverts commit 41094db7dd8b9f5e9189467da7026631ec0d13df. --- lib/MACRO.ASM | 9 +-------- scorch.xex | Bin 49324 -> 49333 bytes 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/lib/MACRO.ASM b/lib/MACRO.ASM index 611e46b..34aa3ba 100644 --- a/lib/MACRO.ASM +++ b/lib/MACRO.ASM @@ -73,14 +73,7 @@ PLA .ENDM ;------------------------------------- - .macro wait - bit VCOUNT - bmi *-3 - bit VCOUNT - bpl *-3 - .endm -;------------------------------------- - .MACRO WAITer + .MACRO WAIT ; WAIT ; waits one frame (1/50 s(PAL) or 1/60s(NTSC)) ?ze LDA VCOUNT diff --git a/scorch.xex b/scorch.xex index acf4de11cc805ec5ad79b5e664f800476ea3b0e2..d277f07c73498908b35236b8b2b63a76256cef11 100644 GIT binary patch delta 7383 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 F{{n0twTl1% delta 7232 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 From 33d83032705eb75ad447e4e23da02c12b66b1290 Mon Sep 17 00:00:00 2001 From: pkali Date: Mon, 23 Jan 2023 05:41:05 -0500 Subject: [PATCH 16/16] readme updt --- README.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/README.md b/README.md index c7da788..c5087be 100644 --- a/README.md +++ b/README.md @@ -51,6 +51,18 @@ With the advent of [fujinet](https://fujinet.online/) we are thinking about maki ## Changelog: +###### Version 1.26 +2023-01-23 + +Early morning edition. It is 5:11 am and I am writing this instead of dreaming of electric sheep. +For the last 6 weeks theversions we released had an awful bug - the conversations of tanks were completely invisible. Thanks for pointing this out, RB5200. +- tanks talk to each other again +- better stochastic non blocking wait one frame +- rare dstance measurement bug fixed (rarely a tank survived a direct hit) +- 5200: second fire works (by RB5200) +- "visual debug" mode in A800 version, triggered by pressing [CTRL]+[HELP]. It displays distances measured, laser aiming and aiming technique. It leaves a mess on screen, but it does not impair the game, just makes it a bit harder. + + ###### Version 1.25 2023-01-17