From 9c912d4cc70eb3c3fe4f4e54cfc5de57d44deea8 Mon Sep 17 00:00:00 2001 From: Pecusx Date: Fri, 25 Nov 2022 20:48:20 +0100 Subject: [PATCH 01/18] Initial support for tank shapes selection. --- display_main_menu.asm | 2 +- grafproc.asm | 4 +++- scorch.asm | 9 +++++++++ scorch.bin | Bin 32768 -> 32768 bytes scorch.xex | Bin 49256 -> 49309 bytes textproc.asm | 23 ++++++++++++++++++++--- variables.asm | 4 +++- 7 files changed, 36 insertions(+), 6 deletions(-) diff --git a/display_main_menu.asm b/display_main_menu.asm index c0f923d..11056f8 100644 --- a/display_main_menu.asm +++ b/display_main_menu.asm @@ -29,7 +29,7 @@ OptionsScreenEnd ;----------------------------------------------- NameScreen2 - dta d" Tank 1 * 1 Name:" + dta d" Tank 1 * 1/1 Name:" NameAdr dta d" " NameScreen4 diff --git a/grafproc.asm b/grafproc.asm index ff18d03..21bf6d6 100644 --- a/grafproc.asm +++ b/grafproc.asm @@ -638,8 +638,10 @@ No6thTankHide jmp DoNotDrawTankNr SkipHidingPM - + lda TankShape,x + tax ldy TankShapesTable,x + ldx TankNr lda AngleTable,x cmp #91 ; left or right tank shape bcs LeftTank diff --git a/scorch.asm b/scorch.asm index c4d5d62..c8565ed 100644 --- a/scorch.asm +++ b/scorch.asm @@ -1109,6 +1109,15 @@ deletePtr = temp cpw deletePtr #variablesEnd bne @- + ; ser initial shapes for each tank (tanks 0-5 has shape 0 now) + ldy #1 + sty TankShape+1 + sty TankShape+4 + iny + sty TankShape+2 + sty TankShape+5 + + mwa #1024 RandBoundaryHigh mva #$ff LastWeapon sta HowMuchToFall diff --git a/scorch.bin b/scorch.bin index cabb7373f108f6e390bab541434bfcf4b2dd0ca7..804cd6494bcdcb51bd0bda0b88a6a8bdb4e4184e 100644 GIT binary patch delta 11846 zcma)i3tUvy_WwM1JIp@nsN)N_hz}GIAJ;}R&9Xv0KCa+{N*(1Tkz?fGt8kDwhUVDN zDFtws@Bw>@aQ;s|s=GSSTJ;Fuq)lS-Er1dGX#xuQq zh@pi0k7rf6MsrO0k7r=xgw*mC0R19!f?cLUzWl7PK{f~*<%QzsQR9Yxmm(9PzZ~Km za#a4p8Ksl|>g=K0Bx{_;lTPEebv;fhzsV+XT#p#XcPX^-5zG>II_VN!n;v{?qd)zX zk`(G%NLMY#sAdv`AE)^XXa-NO@<4A|sORVNvPQ7ce=MS33xaW$EiS$_@YQbUk7nVv9~W{iHj-`==^dNarL#}<@zY% zR#$S5eh1h3loFI zSR$vp6N&q7;+{$5i|&m?*1HRcyuzJJWUV`o&=HH=%S^3YE1gzAd*#v64Rm52)ozj( zW9b|ZcCMWfYo`%5Vc9m*@KieUX}Yw4zOsRy&jWa!93@0sJ(}VWrq#PiKzpo}`{k(4 z+b`HwLRz_Bt#wOH=7NWa`ypbj(~uKu3@!rZHAEgDc<4vj{E7v^H3>xcULpZKo&G{A z=Lleis&zg+5o|SBFGbG}pD*7O{x7|jC2Iw_%I4eMBp7MlTKajeZXV*@5X4Mh3JDE(=BDW;+S zDCHe^9C!ixe4fOe=8jq~X$XCP56GWQB=q5(l{S^c@hs_`KnxWMsAi*N6AB^6b{o@! zo<`=ka#yMfx7%v>6D6$5R_5M8x<^%nLL{sVeQQB0_mkXL@GuR`B!N&ixEDr>4;i`a znPm486H`=};F0Gg*tn!Vw{%$-^{s!h>ze;b?^Wkw)1{@R+9f7cLC3T325vSK+vtS# z(gwlCdYHt=v+9?a%)Ub;Cqzj1NhC)jWLSKM#dnO(`I;97sUuAM< zo80TMOTOiQp0{f%@r@$pwNu#!^TlF3b{Ql&F_pMNzn@At9fl-AOmpKP0<7{uq_Hos z%KH*4#(FfqNw;vLEOk@K^+}`}VGSeW}6>`eDd;x6tX?GW)Kw{k8uBHldim+cI=FD-1p5%A`6?_-r&0M#|m@~?`#pu#sddld3OX*pM$7Cf+ z4ge@8IiC`@_FS2$Cl}9!DZf}NG!QI4yt&@{i(5~+-?!Tjl5ZpVGM9J_c;X}jiasljL=7Fb9=z1x)kCl6(S)@s@U4_ixOD2v zWu}196?S8piQl>Ctoj#-U}Yy*P}!=`_;60=k&A8h%2l?R^D8uqw{P&xBVW!ZfuXJ; zg55WtAxL)je8LW=-4{YI8to9$zTsk9zVflOL21QmIuDY%EQ3EJ5IM(okg#7X6Z0tG zR=QrKy@w4H(-ea=AP}aUltUGr{2MbQ9&@pW^{?nXz88*lBn*gWF8w;i%8yN<)5Mp1 zPb3iOt&|cd(I2LSCk#1qzW1?kU9UW`ZeV{$c&gkkgvzspFnPKV&dj6^R$^&^+$uyv zJDlf@iiLDUs#Kp`H$T;xW2j3>bv|am2B>FNu*(F(z(M*h1NjR~(Hfy1B54Wz`B6F+ zPKnc6{Siv9OIlK=CH_d|8#w~KyyGvA;^ahsq$S*G6`uznMCnUtfVnWbL8OhSb#D?$rtHyj^UK86KiviI*!e!yM2a(}Z*$ zPT#c}Oz`#=#BTPtmG=abgS!=3AmanCit!SR+E1&lYUtyE9CPyP|20@{g>a(is4Bo#R z{Mlk?xO%Zr2hDmAzm;b5Myvcl_k91nZNA4+g?)`rqzd~h?G5`>_B?%LO=&jM^fk#& z|FuV`Wz@A@)ahV0p>Ng_59mVde2+fNJ|e$_yJnW`IW}=TP1NR#Rys}li0G#GYEO%2 zsU?xDvO?&*gbFSxqOz%R9mh{!h3E5Jm93hEY1ckmj6;KMajkl>J4&22bo6+}nU8U1 zZrHauVoB*fe}*eWPA}c3>YA=#w4zm7a6~%@zg|2vw66mW|E&dUs`=Tg{fUY}9s^(e zvil{%+6jtDP7pk0$#l?OYS>4YuMXmky&e8xc{hBV5`m50td1QG2O9%gCO931`l-_U z%jbz=lm`RG!Vb8>zyLfaHKwNF-Pg^0!#+!gwsaqM=C1b$U9?ZCgddP3xB=-D0y-;; zYQ#0MgS0zDA$CR71IAqs8h7U!cRenCAA1kBnzRO6ts>KtEVTzhDw;hH?N(9h4si@< z>FAjh(cJC|skne1HVg|Lhr>7rhjF|R-g!o$F`K~E1cNY7deAQHc(v0ce1pX*03XW? zLYuEG&FL6Q%Q7WfR8&-G4WfWiV*Rio_q<7}8_`!h)aMJnZ68W+WOQ3sW(f~x_(KCp z{;v<~RiWwP8*` zS^(if$}JxA1)52?Vs&It9nJqO4pVHJEETLbkgvo`%X>}n^Bl4E@ zf+#a=gz$1(_lOoz`Q8e|&!E#Y>hNLN;@*)%9Jk0H>qhP*-%aWcGC#IFr@U#U+t;cy z%n}+@>~1o3GIt`|5EvoU%69k&1F{)?mYfUP2I0u>7zhlN9V}mz{~nzBcijjXBT1+5 z>LgoKRp=mG?Vk?#J+7q#xQH)yJ52H@VGB5Ts@`E@(Uh%Arw+Yyv!T+~_z*lBR8uE! z>tq^^ZGf`~F@d^f)eT$XXIyk|HXJ(_phw z?7E%zX~G$PST=m9y0l#iV4#D40I|F(m_BCZ(uZ?tt++0}pChk;MO_*p8tHct67VR& z=y^|d??K5unxM=z+gT=89&0E|2DV*J67oxujLh(3JGv0t^MRZ-$sTPD>`1BIqgUmw z@r^Q++HuNyAWXF(W({hIjWWQi~4$VP0Nicm^&bC6q9ghIB% z#6Qy;t%l;)S;|}^gutd8Ccfv9;o}+n&(LOj!+;v$LcWoUxEu(Ip3bzla*cF%it-x9 zR*N_z;BSHEvDP z#dAL@zgp$1P;(mMvH;?;Bw?dRgY@YUHGOInQ^xQ~8*;mI79+gL+dD|(tR>EJBZ4N? zdCU7dqb#^>7DBg)Rze|kM&KG-*i=CLa<Yxfzzb|2%M2{)5t}(pF`^W z6@Pr)!er^|=ok(maQ$ZK9px@5D`_J2ido|(^gq51u=ZzwSS%Gc@5Cl~rg=v|&wnm9 zjN`TI#T(4*?Yq~|ObgpLq%W{L0|Kl}-#aTAgzIO;cBq}MO(5;CPX zI*{apqD6Y`!joX;2-+EF*Zo9<%(|;Y?KDfTW$t2~Ip~yL&wNtIbpAx7H_*&-UM1@A z*D?G~a_WdbBWD%QCyfX{L~t;0Sh(>qjzdKGp;02rzs+^ITtUuaXD(NM2(`dVk8^d8 zbLA4bw3e%1%OTM^7EIHJmp)DzvY2MRSHmlrAcupD=uZ7pv z3ePbfG1cfNJzC`7jImoSINQ@!i7t+1DmJB&uuw!AQOhwm{)soo~X;*%Pp9V}^ zIME!BJ(P|;l+j{mUP?u62Wop(H~9M?1+jD@9e0aPuv=a6^p5D@RA>dkK?<1R+{D4j z7=syFGFs9x$B$NI{Y*|j=ZaEA&0_k3gk}J9bOLh>S!y9n*IfvcLsfPkm^4&dFJ?~~ zGN*oX*8pvB0G3w87BVng?&br<1G`i+TRRrj4OAw(;b7!q5K&Yn^~Jh;Gbzq-Jx{8R z*W#$ngzXV(>V73k0@RxIG#E4Iu!$nT#+A*1FiTdM#T#PIDl?DR+pVSx*a#5o1DBr9 z+92&!rZH+ts7FV23t$WVaf%tMHGRQRme2w;i6|_Mt%eVfsv~uRqdGW``!M1EvcVJH z_{8Goy@5&1Wr5HV?s8IU!Y|~B1=zcY-$Eg-f3kO`swOSAIKZlVL4N-WxCUxc9AHW~ zL)5#>>cQwl>|lOKzLz2DFa1ie$E9k7&|&i+H;Ok*Y&}0FA0wfR-g2Qw%gE`gvFG*{ zm!XGkK6QwJi8V|OzL^ZS>5g6(mrTAttYvdU_C2e_LzBmHUoZ!oE@TLqLKa&H@r%i$ zjnHKeSklbW!csf`uxPp~XV8_+%3w?&)0WL1O@m#?Y_LQ3rFNWy7P0)UB<*>z^{!E| zj~Rq_;Y-INrg#s}c&+m>jy*}u#fukr=Wz5*(PX(xdr0Ih7TvH-;&zKwSGQRlJ9Y4c z`q5mOdn#9z>3h~7WD8ID7DfweguMDpPLh@AhHU2yZgARSWYO!uJsJ?;t|{3wo;9e5 zQhI!N4G<$5vQ;cAlMvWeDPxY5{@9#3LUvW=+qWY(WY4~NPn!7UlmXh6;;&QE!q~LF zh2qkwZQ3Sr+TF{$0Eh0j-Rn`qFgY4YU1y!F?jR93tcw-9%6nu?O3A2Z^fj zl@}!Y$_kRLmkX{JL~QN7HD>E`TX$}K$e}AV6@FUqX~FPq3EL)ayIAyd(bR3Tw$0y` zv2Dw?twk>u)f62qYArfh6!Og3qR$HYJY&W2@X)Vbg`t%-ZMJ|O<>prI=iN5Wiu3D{ zdk9|s^Jmo8o`OSt4*|G;5X@dSYJBxv`x#_jb5hO3#@kq`P2b|9|)v zDHB68Ay}4_g~FA%ZiZn@7hSWIiSd~jAM6Z~GX2L8x862~ST$q(K+7KR=jBHh%8^i} z5rP7uRUzW#84jIki@5&YVfRlgWUdf*8MEQdb9!}obC?TwMP^x=)4hp^0y@;L4mf%a z@hUsJ-6-Ojdk0VXrWjWeULFs&Zg})mXXH;5qfWx+W^X2NqH+F6t2++ktBZMdZx{vlVZGpS=An5$v#4GRX^Ef8HvoBPgcpLVY%5+6B?tHr5 zhIGH(6MVa8JH+(Jo$$%QR%aht1JQTG`2&+QKzLa^ci-%&n@0NXS}5VBQJi@HEbY7E zru$?2d0)c*3iV{b5mvzS4x_6uG#BNk-U}*=U_ik-Kj?9Y4EK6j=jZq z`k;ZBgvC4CS+t|(CAhA*o>yf<#KUep30r256-lB8m@1d+I^Fx_bzMP4kYS}Qh{`mi z=|WXSQB+Z^biXhd8`Hy<_Y+}@l#$a@cnW5Ii?bDlJX{@!AI};c!E~dHp>1Nw1IgyL zP10*@i?VQ&g_S}UJCq1=GajhWJ|Koa7=t^9%4XFE1j373;8`X;xLCVi-1(r}(XzSj z2Y9oO0_39~NL_&7WQ79ahX>}5Y-h3D?=NoDE1Tf;4MeD6cb2%u#FfokDbk?o_|U-E zviOj|J!SDaEXEf*>d3da*V6M_OZ>m64{30G6P&357o2gY9o%vGUg5MAH=YqHfP35O z4_6{_@r^n?A6bHGSP~knGLHg2%OEiyu5qD?^LYu)gwxaH7t~8-FvChU{8P{Ri!jmW zCH@jT2JG+)cxZRV&+zL4i*f6r=P#A`Sv7pe4u6;f&&fL=w4Q%xr&=oiVuwE(tr0u@ zMm(nMzfp1u9V!Vn1#ptS;GcS7w)yU1>v2`a(z%-f)+4{}#?2X<6g!peR(9`(Zc9f9 zI{YCjhn+|m?ijWn_ib$W>t1!Z=Ff+tl*Wd8??CFj-q=C>Ls%Gxl5{|SV+RT5;eoG$ zYjq1r1Ee89QuJrLk(PF0-JCbX;2eURF81|+y2$d)dDP&fhRzmNMsU-ODQZzu&)D&F0R?t`|&K8m?0>z`*w&k=kyCh>Rai{6IaZc29LIX4n@WJ?KxBjBXo97 zyfOJXX!e3demEE%Y@It$Oqx3nrO>T&vm+oAyE8c|em{3<)VpgFhHy!Gnp7&z=SOIN z5cB!*x;Up;&BqUJ+rrctwy9D`O)KhZm_91d*WV-1%ReN*iW2^Kj7Zw;A0A)> z)tEO#IO>zcZS&%Fp}WP}d5Lp7O&5ysx2#teXDo!UGP1ZVg5yRApze)3Y#tl`n7UrT_YQQdn7C+o zq6^<{;G)HP+gBo1`t~M&j4PzWfV<{i&TE9ll5!&InXic37WG>=G8<Q**Ynhe`V;m}|8oN_7fqAAbsS2C=$`_C=YA#)Gb!8|j4q1Bcq7 z5k6M;SCsGxnmHQbB$SM)hrrlPB7Tz+`)`>S6H^B`C}W8pwW}T=Fv9;!AQrZN#w}BS z-s%qtti}DvFx3FBdXe8LcG}wTYG!AvMb*x#9V{8t^Q&I;umth8Wdsvl>E0x7j~l3t zurdc9@#0FP>K?fl>=JWM@EUKW@XJMz3Ecl@G~oAGCK&4C&LUaF8=Mv@B>ch`RXP>F zqoc|=*uk`eD_tU*| z%gi|@2FcL`A+9N^iDq#ImZc`)8c8Bu!l^Iphz$*vh?x!3ZL5S5s%D zNB#t5!=6GuYRLuc%0T)~-M^BcWa<8M@VQMBTl4B?c#(7D-!^S#9+Q|D7A z+P5IBU1fsB#b-?@+TzP5I@4{X zjxt(Ph6`NryQO2b>%;-e222AsdLDanOVQ33_Eq#65IbhV)cfYZ`oPxsL%pFgh0U|F zMvS+&XJ~^x5Y4n@XCK{(Pb}+$de5uN`k0<4!RuRfj<3u3m@_uQI^^r zr`9m-C%jL%pD(@7zN5s~lX`3~>?OWv-+#xDtB=ZpzmLlYhL-ME+54X{o`ZNcUeK+?fTa5=w z4!nBcGyLn}?&1FIfVEo4pMye@y(}J{B5iS{eaiGDfz|ws19x^fSdV2%V0LAGBR&GL zH{v6ZeD=Z32KK?tMrmVnJ}w0|G}~PxEz*Vyc6@RnZM=|=50!2m?#75E<~+L}nKr() zu)}q;vpp1Nd${*1jX!`I!xje70zye)Ub@zqBEdWXz&vD>L$4WuE`#S3do*=b*#|D+)_?xn3;y zee>IpX(?G7pYgo%;pKr-7B1UT`F3l^_hEe!lHFZD2M->M#&7q}A@Sv`Sg|FG3#q91 z+uy{~SyW$DRdwXotWR{WJyx&RE)ZW``(nflS-33y+W%g0uC0G~itIi(pmEKST-z9J o?@gG!e~8o#Gujh7BMV4U*gNF$%3z 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 QLSe$CW;6Hyyt*&z>% diff --git a/scorch.xex b/scorch.xex index 7d1c9415a6dca48ddb40bdc971263ddef0ef0cb7..5086e8d64330bd0e4e1030b8520e4f957152d497 100644 GIT binary patch delta 11939 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 V^IoET3~ny$a-#ECp5qqv{{ah7*uVe) delta 11936 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 Date: Sat, 26 Nov 2022 14:57:54 +0100 Subject: [PATCH 02/18] Tank shapes selection added. Better appearance of tanks on title screen. --- MANUAL_EN.md | 5 ++++- MANUAL_PL.md | 5 ++++- artwork/tanksv3.fnt | Bin 1024 -> 1024 bytes artwork/weapons_AW6_mod.fnt | Bin 1024 -> 1024 bytes display_main_menu.asm | 2 +- display_static.asm | 2 +- scorch.asm | 11 +++++++++-- scorch.bin | Bin 32768 -> 32768 bytes scorch.xex | Bin 49309 -> 49309 bytes textproc.asm | 8 ++++++-- weapons.asm | 7 ++----- 11 files changed, 27 insertions(+), 13 deletions(-) diff --git a/MANUAL_EN.md b/MANUAL_EN.md index a57c227..9792b9e 100644 --- a/MANUAL_EN.md +++ b/MANUAL_EN.md @@ -28,7 +28,10 @@ The [RETURN] key or a joystick button moves to the next screen. ## 2. Entering the name of players and selecting the level of computer-controlled players -The second screen is shown for each player. Here you can use the cursor keys or joystick to select whether the tank will be driven by a human (HUMAN option) or a computer (other options). The [TAB] or [SELECT] key, and on the Atari 5200 console the [5] controller key allow you to choose which joystick port the player will use. At the same time, you can enter the name of the selected player from the keyboard. +The second screen is shown for each player. Here you can use the cursor keys or joystick to select whether the tank will be driven by a human (HUMAN option) or a computer (other options). +The [TAB] or [SELECT] key, and on the Atari 5200 console the [5] controller key allow you to choose which joystick port the player will use. +The [INVERSE] or [OPTION] key allows you to select one of the 3 available tank shapes. On the Atari 5200 console, this is achieved by cycling through joystick ports with the [5] key. +At the same time, you can enter the name of the selected player from the keyboard. When the [RETURN] key is pressed or the Joystick button is pressed briefly, the screen switches to the next player until the difficulty levels for each player are selected. The player's name can also be entered with the joystick. After pressing and holding the button for more than 1s. you can use up/down movements to change the letter being entered, and left/right movements to change its position in the name. Releasing the button ends the name entry and returns to the level selection. diff --git a/MANUAL_PL.md b/MANUAL_PL.md index 9080291..f9790aa 100644 --- a/MANUAL_PL.md +++ b/MANUAL_PL.md @@ -26,7 +26,10 @@ Wybór opcji klawiszami kursora lub joystickiem. Klawisz [RETURN] lub przycisk Joysticka przechodzi do następnego ekranu. ## 2. Wprowadzanie nazwy graczy i wybór poziomu graczy sterowanych przez komputer -Drugi ekran powtarza się dla każdego z graczy można na nim klawiszami kursora lub joystickiem wybrać czy danym czołgiem będzie kierował człowiek (opcja HUMAN) czy też komputer (pozostałe opcje). Klawisz [TAB] lub [SELECT], a na konsoli Atari 5200 klawisz [5] kontrolera pozwalają wybrać z którego portu joysticka będzie korzystał gracz. Jednocześnie z klawiatury można wprowadzić nazwę wybranego gracza. +Drugi ekran powtarza się dla każdego z graczy można na nim klawiszami kursora lub joystickiem wybrać czy danym czołgiem będzie kierował człowiek (opcja HUMAN) czy też komputer (pozostałe opcje). +Klawisz [TAB] lub [SELECT], a na konsoli Atari 5200 klawisz [5] kontrolera pozwalają wybrać z którego portu joysticka będzie korzystał gracz. +Klawisz [INVERSE] lub [OPTION] umożliwiają wybór jednego z 3 dostępnych kształtów czołgów. Na konsoli Atari 5200 uzyskuje się to poprzez cykliczne wybieranie kolejnych portów joysticka klawiszem [5]. +Jednocześnie z klawiatury można wprowadzić nazwę wybranego gracza. Po naciśnięciu klawisza [RETURN] lub krótkim naciśnięciu przycisku Joysticka ekran przechodzi na następnego gracza aż zostaną wybrane poziomy trudności dla wszystkich. Nazwę gracza można wprowadzać także przy pomocy joysticka. Po wciśnięciu i przytrzymaniu przycisku ponad 1s. za pomocą ruchów góra/dół można zmienić wprowadzaną literę, a lewo/prawo jej pozycję w nazwie. Puszczenie przycisku kończy wprowadzanie nazwy i wraca do wyboru poziomu. diff --git a/artwork/tanksv3.fnt b/artwork/tanksv3.fnt index ddd8678d0ca1309d01660ba9a4f3240373937505..78e514c08d69d07b31ce41ea2a4554cf0f6f059c 100644 GIT binary patch delta 31 gcmZqRXyDkO#wc_(>pu`QGC+Vu-RiK-7K|sD0KGE{BLDyZ delta 31 gcmZqRXyDkO#wc`9>pu`QGC+VuU31803&s;n0JOsjr2qf` diff --git a/artwork/weapons_AW6_mod.fnt b/artwork/weapons_AW6_mod.fnt index 272cc873103492f419e88785a53e15c47f02885f..8d23ec94d702f18c9fe159adcdc0e1e8f9708682 100644 GIT binary patch delta 18 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 Y%Up+`MC~+aKWMeh&~58^vc-Y=KWrbewEzGB delta 7563 zcmaht30M?I*3&b?Jl**k-r9{%MakY_2Mvxs_Y!1uiZ^l_BV?T#c*w3+C*&5GDjI(Qe6=l>< z#tk(R$rbZYM$gVDe9Jo%?tiI9(Arot?>ajBfmkLQmmsM^v_oj8ILMfpbg2K zM1P4yt$2%*FLhVTP|QZo2?3i|CaT4(Q?plVJkn>;uPptBqkx?o#Te=IrJSumqs7?@ zI(lXy8mUEXs7S4s)%1M}fj%2nWJ2i^gff5VRi7n^>ex!J% z=tc&;F0Qe)+Z0Y(>`iZz78#m-xSO(|2inHXCK<`(Gy}>kqXU<71I+)Sr|BHQaE&>p zgXb9+q}_z>WSdqiEM7=)v@r)JsAwhY%{!W9C?$ivX(2Rp<1*7(lG%uItj(RIW5Bh`nd+abLF&rWTZc-OC-$+RG=PD3?FPubc_BG^) zBCe&gf3)}@rVvTCvN=pKY-3N3X@;-|hrDj;Nn`PzoKtnA*|ssK+E7jobJg3xmJBmU zbS@4@x+HsEOFy;B4Fqf{%|TJQ>=q^m=2i{3$z_VXGzsbPeV20ER_qfTg@lvz%4T7X@ieMT5a`T8*g1om*VOpo4&iAiV(35eI*Jvj|{S5A7cn#)8 zujR8uy`7?74M%~WBJfiQ_^E{1+SIt^YfuuGe8Iu|PbI6%a%6NB(%w9ygx&htIt7Zu zA>Ogd$91$mS@bF3d4Mh_gNqOvRE76@`xBqy)7~C(@bgpny0?dCkQz3|O#_>_fKB`u zJI*uU0VUY$NAYw@c-Xm0Mt((_2R9<^*lVQ_OP zJJ5BL&W-17U^8y(VY}kzXEUMUrQpH#mg&3%VBG1ztr0%WqN5H{>&#(E?W-+Ti=LD6&pblty>2w&I_Ls{bCnRsbAv4KCsxL+>Oss zdvqrIRUp0wXZrf7n-a{nofP@m?SwV}X^cvatjsX_a8zZ6lFi5(&E&J0SrTR&@Gz&4 zEWJ@DfZd0|w-cCCrltg@1zk)tx^wc%4B7>M=Btc*UCq>XzNu#F8g%Wof;x?H6ep?7 zxN-rRpRzjic@=X?5Je1$5`~)<#ceL^b9#sZ134^mc-QB2A9u(s{xUPqCl7A0@A(uE0d?;*t1nqfqQ*`6DK z*iA3S-eW_2)JcYD(lorz_F7dRQCSNMIq(sQR(7P1^&+B!)UezfhHAD(P-BYKd&^Jv z=CC=JTFqZ-z+)jau2wKTrk*5yksqqYzxNL>f^n&z$wW4F!f1~l>QA+LCODvQ!A_>~ zHkL@<)-s!yTWIjd)!>(J@c%YnXnmKmDE?+=wlnGdf{V;V_rZ552(5ZQ`qPxgoc^;U z+@)Zd;Vfy12S{%Z+rvAU<*>>gRGkKpE`U(-shs@~fbCIc$rzxjuw#2veGbpzsy={I z099rULGkYbTt|JH0^$s;2ZS~Q?_TjQ*Fwu=qs?qx$c$cEx)9UR_tJRFov;m(AoaX)@siuJ{qwX6e^^(p8>TeRW z^98xZ;ravI9~k63i0x@G(?c%@gK26{~xAhS|dA zJ?vn%LIPmWG%Ot#OiaU}<0cSMIB^{E$jD;bm05D8ox91L;nYkAI-9|^Gq;c$SB`TH z&5h?|4CVwpmC@S0JIFu+}{3*=S8RI+e`Lhd93k;`{(pFXTVYCqT&1+Cm`% zN*HG-tV*D?a%5bL9|?I7e;Pc|!IG63Yb2UYJ=k?ZL_FjJsFmRQC6N#t<4LAPh+wV| z=kl^3l0u*y#HR`P^@Dhy7w|^^mIq0dy3D34!e(XkE&TR`v0h)t*V`a6yPNu{-Ue!v zlO!M0<}B6-P#SzZVVn<{4RwR*5L8+yM%PVsqJ#0~GoY&;>OHguD?`HUwx|uqNz)EY zhXi?k4~a7g5~l?cXC$)~5@a5~)+}drd?(h2&Voa$mYb>OZMczf#V-1&Ip*83sJrK!`kyg)OX|8wn?vCDb0pz zI(Y|jD`1;pM}NhMQPXW7tCC zIXgxt*gwrI?Mm-T>vGVUzk?tJFkCT784Rb80;iDLr87UVg17YoX>a;4_#ajY_%D-C z#B(`Tv}o~^K4+^cm|4MA37`Q*dlRjAcC?Q?9Snjs(E%`JqW$3aM6@sbUXJ#iFvJD5 ztd4D7OoTZ;3WkTuuryfOSFlF_U~2M=anH1DQ!oKe6(cx)bIXsUITVbMz5}eM%p#aH z$aXsP1iv-epGe15ljqn@-eR=td=uZ9oE{-C^D?t7Fhhwi@XF|rJkxO!B)W3NMk4eF zGE&wA20mI^O^4t&r}#Kn^$16Pbjm#2u5IlZvo_$*r-Z?K4;GNZq%vtty0|>AsS{kD zY_mAQoldJPuGGh+OK9lU{COCD{Q#;R1Z%yoBGxG{>&hFx;V@l562ia zYyGS5SBc@svDs8p7;CC7jMY3Yd{$_`({-oM&iy<0?R=$3TI^PQtMFD~;I7bJlXiVo z@~@KVyB6$PzAJTC!LFSpM@pJYE|hea{Ix{B`(DZI!cqACtiYl>yEz*u^F}ajGz{f1 zbbmhdu?`0b(4F1znq0)DH?%ZU%n8VyMiqOt&xW}Q_uv|Ov=5$~v*9h>h9*}DLeahd zpWej3sTaj`$jlTjp>jfRScg{o)RTZqSjUHFbIe=YVVA%j61PGoux0rCl zXXXYFlkly%>!*EL3Z08K8a{%};R6Q()b#aI&U<*|22v#Y??}#Be~pAf|Im z##HWtXWEN6J1ed(#>+jWMA)v}y4{v*aD}Cgj)F*Rj`1X(;ICt*5)n9H-lP#JC7I3L z)cqURNFams+=Vmep)qa+5F3r0{V(+%pEv3a(EBpZM%23tTti%aeJMA3c;q`gnq?i$ z+5@{Za)aT9C4+i7Mn}RkgXt zN-AtoGDIpa$}BEQgX$P>a0;VvJRdU!Y--jBW;?{M0)00;!=QVCM=qRTFYMABf_m_R zg|QJm`Ro}XlQOC7dqRd~(uE5F7guAHa3BNhxn0Q?q@{qk?P;mFW8qBK--7?Na3--3 zPhI3go{Mj|)FR{qi(P3KB!JXK2}B+KV3EPQYg@~=V6Gb$^2WDhi-m+sU;_{yj74`~ z-763}vV|rWv~+gU>^5P(b?& z9(LEbxy(%sw0Z2U^A9z=o!J51)uO6o+Mx{IS&=Y-dR1s+2$deFg9aTK=7Bc!5=qI5 zQ0!r`&j;qc2^BBBeJ@`Eitd#0W$^JR=Nb4A`=FO3wIuNNF!`p87n&30&FvlRJUKOi203(}=tX7lP7^p_Sq3TiWKC?S|MtD6 zLeiimOy#=fz$tKCc>_?d1lR`6~3j z&?6I?t>OUy2r2YPF*pOWF$T0XUVPcg=z+Z&@HKu)+f#jl8?+pSrs*}Du_Ogz{M99I zkg@y0LJw8kn!yZsdZ`E2EL|prWO#b%CgKA2rV|}5ZVL6KB4sEN7t-UPbY|&^L;$`; zPw?)^r~kg6y#N>FPfTjdW1%p80)=Tn4N&)BpJj;X!E=^*D$5Rnn)?AY6qF_h;dTih zVT|8e7HS`PkPoy7lg4Gygblv4EP@`41kk^D9t?)m2-#56304Caf*b_NOgyNULWsb4 zndugp@v7w^#80?n`BeD*V0j7gKAsg9_D}^6t%V^%h8C55a%f0Mtd?WkxJ7P%o}p;XkUs5Ga0yxv^rjH1-hoUFPElXw>_w z5Hj5RMG_qNYSp5sT+!8pT?=(DG=-oaY=|MD;Vg7QA84&{4FW&(UoX|?H(Wwthr7F} zr*Jog8FbjYP#7jw`uR3iA=y@qX|DqM5-XgUymsB!avUHM);uR*sfe97a)i z?aJ{JDxj$i{UXf^?Q;$KFrW9SkoPH|-8)kMl!VgL$c5vUm7estj7Fi=oexFU^`~UT zq`^hA`Mgbq(2?X&l32gqJ4yEDLzEH`j$*76ar7sk&q^f-^Z*_d3^MWF1mBU8tsvZ& zF+xt@-OOYE&e3?C+M@^wO3?+K7}_jB{129~5Y&WT^OT%t{VYk_9|?j7gpnHw zmsg0o5D(AA)5#dbSmwVd0|%;+`-&qXas4ld#f^9q!FY$-3;e7`y+CNdf36N0^-N12 zKhjOT4I77~G`Jk>n=mgBbXiOE{*$DjSS;=7q_;(y!Qwp^?@2&}1fNLQ2QD483j3O? z^mU{LUep!`NU%0yyH5iR$H5*T?pZb7VZqVZ&iO~7rHDr*`i4VuP$x7o^E6pU_Z%Hl zeY={diK{WxtUM}24SB^=-lgsP;QppgkqvK5TqTuM;|~&7ImH+>sHhq>S0e@XTpdnq z#!FUvj{@lHZxxj6J6u~o(qn8$)bx2v&>_5I^-34987Z>ducm$Q-PNA%FM_}muGWZs z$yyYHsiX+sL<4WzW+R5hLAIA^)+I%R{{~I!upFZt%{Q6uX8*#W! z#Wnz615~PP*C+IJe0i^A&!GB_D-AJa53 zc}tcoVRY5O;Fw7X4Z3NwS6MdFbB_HQp;~2G+>qA^Epc6E6Q2KC@W$bj>a<^_)arOB zrJ>oZgU5|`4q`qtgX6IUO5PFu0Mpy9*rzJJ(`3XL@k z{k`+fJNROHgtWfC<4L-n82P6O1Ms&?V*OL?+^z07oS8+OdA(Ie#NpGMj@ZxPn8)mo v?sM_d9Cy2T&hU;$XJ$usj*76g?g?|7XE_I{jZx5yFdFNjJ=gJMvorM{MJU}3 diff --git a/scorch.xex b/scorch.xex index 5086e8d64330bd0e4e1030b8520e4f957152d497..c41eee758bdf355ea3b1b5b9a011185cb04c8ccc 100644 GIT binary patch delta 5621 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 F{|AFN^N^VexCuaRDtjak0KEv$U_OQjDipa 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 Prj}OmNo=66?+){S-!*w` diff --git a/textproc.asm b/textproc.asm index 8c72510..600d809 100644 --- a/textproc.asm +++ b/textproc.asm @@ -1164,7 +1164,7 @@ CheckKeys lda JoyNumber,x tay lda digits+1,y - sta NameScreen2+12 ; display joystick port number + sta NameScreen2+11 ; display joystick port number lda TankShape,x tay lda digits+1,y @@ -1208,6 +1208,8 @@ CheckFurtherX01 ; here we check Tab, Return and Del beq ChangeOfLevel3Up cmp #@kbcode._up ; $e ;cursor up beq ChangeOfLevel3Down + cmp #@kbcode._atari ; atari (inverse) key + jeq ChangeOfShapeUp cmp #@kbcode._del ; $34 ; Backspace (del) bne CheckKeys @@ -1234,7 +1236,9 @@ ChangeOfJoyUp lda JoyNumber,x and #%00000011 ; max 4 joysticks sta JoyNumber,x - beq ChangeOfShapeUp ; change tank shape + .IF TARGET = 5200 + beq ChangeOfShapeUp ; change tank shape + .ENDIF jmp CheckKeys ;---- ChangeOfLevelUp ; change difficulty level of computer opponent diff --git a/weapons.asm b/weapons.asm index 33612f1..baa9123 100644 --- a/weapons.asm +++ b/weapons.asm @@ -902,9 +902,7 @@ ExplodeNow .proc checkRollDirection ; check rolling direction (for roller and other rolling weapons) ldy #0 - mwa #mountaintable tempXROLLER - - adw tempXROLLER xdraw + adw xdraw #mountaintable tempXROLLER lda (tempXROLLER),y sta ydraw sty ydraw+1 @@ -935,8 +933,7 @@ HowMuchToFallLeft bcs GoRightNow mva #1 HowMuchToFall GoRightNow - mwa #mountaintable tempXROLLER - adw tempXROLLER xdraw + adw xdraw #mountaintable tempXROLLER SeekRight cpw tempXROLLER #(mountaintable+screenwidth) beq HowMuchToFallKnown ; "stop" if we have on left end From 42cc896ec584f52d11e56e87b4c582200f77153f Mon Sep 17 00:00:00 2001 From: Pecusx Date: Sat, 26 Nov 2022 18:45:03 +0100 Subject: [PATCH 03/18] Weird optimization :) --- scorch.bin | Bin 32768 -> 32768 bytes scorch.xex | Bin 49309 -> 49305 bytes weapons.asm | 9 +++++---- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/scorch.bin b/scorch.bin index 67f18e8e04ea41cbcadbe81734232eb200890b73..a0a58f5052b27609ff9e23472ff88bf7de8fd03e 100644 GIT binary patch delta 1913 zcmZux3s6*580PGQ=k8t}L9mK@z(phw@R1S%8#)5JU6%JNM0d)uOrwE;Fw}v_>#`IN z`Du4~Tw5I$xsDimn;NXOvcfK9G8v?eG36MEHMZ6G8cRC6F!Y#qXU_kB-~XNeob%uR zoW@2`W20zzlN>z?8S+Pw81~ASqH3_oRm;9TNJr`MDfbASoCn)ZsVDtEFx>Q@@VjO_ zy>lv_!g>4;@-_<1@HOFwMQD-_!CxaukOhn3*NBH)&ROt@+>EsR_Q+aEfM$R>RrrnO^#ONq*OR)H&Vm>K(BSLTUd)Ehx&~fNYeP4F9#eT+_#!<{L zj)RIc^&Fw#9jm_6=WJUN`RFb6=ESzGa8g&<~*2TdQ~Im!`L_l(I@ba zJRX7k63q0a{am<7QECsZ_NQNfMlBISInXL7(t6j z>_O`<6o*=!6m0{%@wDRT>ty#*+cqr9F_7i2Z!ARUD5P%cQv})T$3>%iM(a=3pC6-O zX44YcqG>`+@0lZlGa^t5zb+#Mp<_^!xgqePX^8qsm>n0>wavmEmw`_+& z?4#H!%27wLJ1Me@fl9|tDs+c0K^^BGR8jPCxSkaoUTq|4Yy*`^Bs${`iivotib}jf zS3{yU%7-Z4VoM()Xp467KTx7p39Q!7#dyrcPihy(FCZiLuq&^_LKFCsBfPVoa1 zMF>1;c7E@!4cyl*PFX-kZZ=ybYgNhI1)M7$p|GqK%jOX|GQ;9M1$I^l>k!kop+Hwh z`t38_E~J5^C$6D)Ae`QcqG2B$ji$j)uSARBYkCFx9;Detp$%>1v{%*L{$e_^&3=Yd zEwat!Lv?nXcXXQ&<#d68>@}i4TH#7|i6?6&-EHgC2ZLU}8vP1Q`gLSHt#2Y%A~h%7 zXWHxt^(T`qf-z?wSzMaCoNOdMH{e?*D`W7@$KR6n^5_6lZ<4*AOzR&OjoL>i=#_A;JYxOT zmVrux@3FBl$DQ6R$L-!MgS4-qZ=ml2`HNT)d!f%T$kgg|I;O@NLq2dtQGd;28;YGz z(Q9Gp<`+_MA17hzT~$V;%GB^JjQd9G$8Q=2DqUm*As?A1InTd^OI#d$u~`}BlKbCu z_)@3QWZ zbPkT3zu}`!G3>FP_~^SE%GlLq&o=c8e|2f<$KUVX_wbC=<`kFjGPYZWJ~;Qqb?>04 zjH0@RSB$TAyfyV($ZB0hWxeIl*_pt^%$%xT{=@IC{V7|jVHbXf4#C;&Pa`|O?3r&w s(6K{u>bVnQlmTx(-{rlQV}7&W4O<6KREBx!IQEcoWGlb3^7Vkf071+laR2}S delta 1984 zcmZux3s6(p8O}+lJ7v*`Rn0g^(7-BGf4I) zFOAfXFy}nyM;QK|f2{ZD`G*OzAXxToGABW2_`#)iIjZ0@v-AjE;9FMB7b7?6S@U7| zR3|&;%jPJ?jnhbVwr&=P;1mJCmYssq$c5}JXo`gA=ukRYmZL?d$d(-My!1X!#JK6@ zZJdl5}~coz1#Hp1T`rle_y{aB6bSEspkJcksIRBT0VWlYJ}btHp3 z72FKtqR}upo|m$yq1|(Ua_yl!`zY5g3U)DK@$8}&?2vcs~l&ORnpP%5~bCs!psMz$X?4{SbX|dlE&2ncq zz1sT1Yv*G8;XPJL&`ySc#7g-j&#e>y_ibNpNf@o55>wiQuMs2uF8y+a{ z+`1Vf4!7a(IS&fLxNx(X4RHzTV-or?DKPAVmi)}H8|g{L=DX<6L``o+$)u59g1#cB z=w(PtF3~?mUlL?2UT~-zig8DGLMfpWy4f)(YC^YvPAtZh(By7mvCr=e88gJ9ZgS07 z3LT!7Z$yvC8~H0>JfD9MZp+Gob+WJeJPVW{zDf=i9Dt;#Fj1pF>Y1UKZ62wTsbw!R zKWG2SY=?AX_zck(W=Zu&X+3$fa4XXDw+m%xUSiM0gz|g*fq7{E@TXicO*_Jp+ zsWrtcOt<4s2fpd38L@PaQ$wO7mWSh%FW!?%`C@SwDKaIaF4AU7L`g(x){t>iZrCKe zAPk3V>o`BQ1#Ki1MHqIEY zk>%L)MzigCIEF-)Ch2PJZ`z|AmmE(Wh7*nxM*CU$13`N1dm+O8DCzm>(SVrzq_hM* zA%83_4O{K1!A%a#I^fNVDN9Y?>0mB%DYixxyZ}uq?gLx1iWA#fR3jFgYQmu2xwq+H zXHWl7lqNoTc~-6gcar^O<)IMcrh`^Hh`TH^+3Bm55 zKpO{=-gNx8rlNdl>i^NyzKAm@#n~=)7;YiU!u7-^{{8YGBsDqlU&u!lDb&aPne65J zLGT4Z%znV0R4hTy$fC+5>4AQ53oBD7lXC%kdB;mhSLKpOn=_LghGoNUv6uB;re7oD zm2s=4I!7!u^0y`?JWrf?p2yC-8ri_1fwu-O!9Um)?7B2ibDF6)7z|9EBMDBvx_G#5 zWp0V@XLJ_PR{d(8Zh(_AP5$yDC_m+XgmvUpl}fD}@HTP5FPVjY2Czwjs-pv}a@r%O z%j@_A_35!xEuQpY-SREfv+;}XD zPFP>O_1ArW@O&|?NL*XnI&ki@yVDDouBhI9 z#lJlak4Z9=Hy>*6I@ezql?wxAScYGLUzE*&CY0G5=)$rCvogTht->oa>}!bQ{0Ray;_ii(^I5 diff --git a/scorch.xex b/scorch.xex index c41eee758bdf355ea3b1b5b9a011185cb04c8ccc..81de8e666bf873b4c22fc516d40d76f324791d06 100644 GIT binary patch delta 2074 zcmZux4Nz3q73S^_^8Wz01{RUKDHOK+n505XLIp(!Y916qHJYky(6ow%XoSk|0EWl9 z3%d(@ciA8IArN-6&lIz|!IT*vO=C*t(HeKs!Dcck7002)N$gH+G}H|A>_Uyx$$c~T z-1B|kJ@>rx&bw@f*w!KT+$ct$dFP6chawAkp)3#85KUPs@{#jpDL*PO(i_UKEI8jY zav`jNO1&QYzUod0g%uXO`Pgg@g}vUpWfv(_?sXk_ON8>hWiS5~t#7j68awW+KJ2EC zR}0xb8JEQjSxYeBO0xCfKIHKZ9%LnPE*Eo=Pkf8<{xdMw^DZxaI93W#_P_eJ7)5)- zPgo-m?;U9_LMYig-?Bl3;)%5F_fgxsos<489L0FBk@(tDSAZBUIsh2kvyhQww^yL; zq^&(wVeSWUBqwEtxJcl)cYa(L>+9h{n44pZlwXX+ZdC!V;2_(kyi2U6>pUTFA2CM z-M=Uf>HHME)J0646EV?&RHZ|Q@PjfHoc~Ma7YIcYPnRQRt+UA|nrfbEy3llWnj-tu z8={it0h(`K0nVru$nHI-&POPW{Nqefe6Dtk`b1dviRqa$!u^0D`I>B`A~l-SwqYX| ziiJveQ_1qz&EjSvdvrbbu;#-I@tV1~3p z7MNVEkOrnrD{KK{)Y41pu?CTn5-5M98;&TQIKG!=&y017f_u1SM#6%I#A!2s=u`8p z6nlc=Pf_eq3KDVE@<*wJBN5>BUR^pt(J`b-o0;rWL!cp7?Pg#Xf}|M4vnQx0KBs-; zKU(=SvwLLx9+|N04-nkD>>gP#8i%0Hh&hK(p9FgIf&>Ub())-AcBh30;s>{ojPCW1 zc%|LzU(UDq=T@r3Jr>A;*HA);Zw;5iYM?Z;8VUgXh-kSqB}$hP6|C^;zU5LJrNdFH z9+ZS(@s3I-D(UWT*6W`{t)xt!jfzN% zepkYr9%^wj)fOwJJN3>-5rqK&&{(zHg*n|#{7Yuuln7nN$MU`aH@HEU% z_MV2H=-u9};k1QMhy`sfS?XE;EcMnrTa|6h_Q2+`j759`9kwXMc)nIH zxhH~RGHcxppCi}yV&qv?h5u&7VK!VtEVi7VT(vSYT$Zj;1~);IjJvFBmT@9oi_BGv z=PEF$YhG_Utu@+5;^mKLKK1Ojo%l=gjcsoj#3;1UEmrb`T@fF2xDc$g_gtZ{$BxgE z9{a|WaaIWRNTIbgko)&&KC^Gk`5w)ohjE4^c$jsL!r$n0!f%Sly-yEFkz{-TXOcok z7L_)z**UWyg*T8g4S+Q}(&37E)1j2yu!HLZ$@oBmbLPl*l1Mf^&JWv0VcV!jH07L{ zp{=BdRXn%7+f}QII5$1bA8?fL`yC~!V~%-8G@A#{5qR=gm7A&GxpOB|XH~)n&)YRx z_e|1me>KgLv+QeY)ecU=GzH3!p!}5QYpf=UL0O{OG1bI{e#dMGFo5|;$Kbjk8+(V3 zpd$WHL0SjpNwuI`VIx-g5QvQ-Laq1WV03ufwNF34eSb-@qoTUDzD0j_eDd#KJV?tf z*ng~1{t!_pdFW$DS+LQT9?*^{-#mcrNiD{N>KQ zC0Tk-?$2Lq>KVH{JAeDmSND^4>}|DQ_;6-!NvbSww4A^6sYsqt{QRMlS{EA}gTX9s4eq#z(TBrpa$lE1b00l#%3wL>E9WN7gk=3@=4dS@EwppOG{8$QD z9)Vzf%nkV?FGb)Xj}|u=I-R(t+iIKX!)=GQXs3?jsI81TtEO(XtIo=vm!R!z_r95T z?)RPVo_p`P=Uzv%K&aXx1ycgEiM4>+NT=_DjA>HMfXqp@@&v?AVOsAJ)Md*Lm z%tx?BD)V&GhwAGQ6wb2Y!k5qGQ}})FzsiqLXp?t%+aU=m_Lf(DjTXLX!x|^<*uHCo zuGuc+P09IOrr%zQfzKnWtGA*Fue+L!OdcI(j`-6KG2YAK|26-pm)?~mgD5Y(@{SZG zdt++tvFIc3z}^ysRNk34(j{mCk+uFkzO;w?Ah?pJ7!S6Rsn*Oek;o^Agt;vjSxH{o zv#6A`wq>duRuISWGNzx81OJ+i&x@0$_VW?U#j!h7P>Q3;$8CZ64l6Jo+SJC!fG`n+ z4lmoTLU9f&y^P`0M1lzWnvla=@)klHfsSMN1tJ~lWjyTtHr%sz^2rcsjyHzUoDa|= z;JdHCLGef*q-cqjSUP-($>LIF{X6izay88VBC`phWa8;`CH;zPo{|Li2Aap4Kbxec zBFGEc^u)9oAZPYIpgOcF?NjWUX)>tGiUGw0yG0J@3*Ew>q1(Ewd~tNh2jO`H$w$m6-uJ41i(Iig5*&iZBZiw3 zk+PnJF~zpvg-~jUrf1=bhe*rMZpet&XT*o{7tS3}I9`wA=MZd|Ve#)OI95nCN$D3z zpr-+j|$Vrleu8|)}HZl>FWoz700{i2!ubvmNk_=d$Mu*86%lgH~E%asb zpmL%|#Hxw5gsUdx@;@b3;&BTx^~y@tz2^LNNjp%xpq>hJO z1OMaV#hH}kMsKeqqL*}9ccG)?hSdit<85SKflc2>sc|t`V=s;www3xg8@yXYZ_my= zX}fG|vKKk39pjE!$AoPx_DdnsbVo?^+{(T`;tPq%8T%jLPzoHI;|5tZzF^1k4y+-> zk-zi{J9CQ9)i=rE#y89PWBR>vUZQ_PKCHnPp2eX4b6xX3o!L2%qI@)GNzpUw@b}~g z$Mf?b#u^9RW+%B$RZ0l(5jfAe{{)36oOqCQIiJk(u|kwb2DRG_YyYK&E#!u-EFlJ` zlH7Ju`Ts|~<6*@9NX)U^5ZpbEgG-5h-lcsq6zS{3Pm&d`Tq?V-kUMon278e)jleay z7Qut^wktdGJ14+@fW+6Q;7;xSNfOO2O8xk0ihaPSGy1idCsfdxkaY*wM*J z|8`fYzsgmru5n#;C9_5Fy#ikmX=hW>LDI+mWpj^T!H4P>ritd zsRHteIg*e1Ntpg~p+A;d7j`|AlPdSGmx+;*#7Mss)P-EY$HvBnhep6m7^2pB54#g$ zTE9Ab{`x&hR$1lFx~4Yspzrv%!P)GBlB${({kz8kXZ|xkv#_$>cBXQR?{*Z+Q3gJF~vn>*Y{(MTF(Xv;_%d3_`)ZgA*9=?^Y^WK36J^O)8t-<5{=TH|c%sudgTn7w+(+-~a#s diff --git a/weapons.asm b/weapons.asm index baa9123..2c20a6b 100644 --- a/weapons.asm +++ b/weapons.asm @@ -928,10 +928,10 @@ SeekLeft .nowarn dew tempXROLLER lda (tempXROLLER),y ;fukk! beware of Y value cmp HeightRol - bne HowMuchToFallLeft + ;bne HowMuchToFallLeft HowMuchToFallLeft bcs GoRightNow - mva #1 HowMuchToFall + mva #1 HowMuchToFall GoRightNow adw xdraw #mountaintable tempXROLLER SeekRight @@ -940,7 +940,7 @@ SeekRight inw tempXROLLER lda (tempXROLLER),y cmp HeightRol - bne HowMuchToFallRight + ;bne HowMuchToFallRight HowMuchToFallRight ; check if up or down bcs HowMuchToFallKnown @@ -1051,6 +1051,7 @@ UpNotYet2 lda xdraw and xdraw+1 cmp #$ff ; like cpw xdraw #$ffff + ;ora xdraw+1 ; like cpw xdraw #$0000 jne RollinContinuesLiquid beq FillNow HowMuchToFallRight3 @@ -1062,7 +1063,7 @@ FillNow ldy #0 lda HowMuchToFall bmi FillHole - cmp#1 + cmp #1 beq FillLeft inw xdraw inw xdraw ; tricky but we must rollback xdraw in proper direction From ee9d6b7ce90d4a8375497793499ea7f32c82553a Mon Sep 17 00:00:00 2001 From: Pecusx Date: Sat, 26 Nov 2022 20:41:50 +0100 Subject: [PATCH 04/18] New tank shape (only for robotanks),. --- artwork/tanksv3.fnt | Bin 1024 -> 1024 bytes constants_top.asm | 6 ++++-- definitions.asm | 3 ++- scorch.asm | 2 +- scorch.bin | Bin 32768 -> 32768 bytes scorch.xex | Bin 49305 -> 49327 bytes textproc.asm | 14 +++++--------- 7 files changed, 12 insertions(+), 13 deletions(-) diff --git a/artwork/tanksv3.fnt b/artwork/tanksv3.fnt index 78e514c08d69d07b31ce41ea2a4554cf0f6f059c..06269bbab1b692ab4fbc09273de2b4227b27b14e 100644 GIT binary patch delta 70 zcmZqRXyDl3!f09lzcKXx{~ruc@ZjJ7##R6S%ft8#GIa;F{sTcHRK%jLIRwn#oXFVB F1OTv&8&m)Q delta 40 rcmZqRXyDl3!YD3Z-x&J;{|^Qzc<|$2z^DcQF-Q-k diff --git a/constants_top.asm b/constants_top.asm index d1df47b..aa4294c 100644 --- a/constants_top.asm +++ b/constants_top.asm @@ -7,8 +7,10 @@ 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___________,char_tank2___________,char_tank3___________ - .BYTE char_tank1___________,char_tank2___________,char_tank3___________ +TankShapesTable .BYTE char_tank1___________ + .BYTE char_tank2___________ + .BYTE char_tank3___________ + .BYTE char_tank4___________ dliColorsBack :10 .by $02,$00 dliColorsFore diff --git a/definitions.asm b/definitions.asm index 529799e..a8bf33c 100644 --- a/definitions.asm +++ b/definitions.asm @@ -37,7 +37,8 @@ char_sandhog_________ = $0c char_sandhog_offset = char_sandhog_________ - char_digger__________ char_tank1___________ = $20 char_tank2___________ = $24 -char_tank3___________ = $28 +char_tank3___________ = $2c +char_tank4___________ = $28 ; robotank shape ;Weapon prices (*10 on screen) price_Baby_Missile___ = 0 ;_00 diff --git a/scorch.asm b/scorch.asm index 1e1e7b4..fd06f7f 100644 --- a/scorch.asm +++ b/scorch.asm @@ -1972,7 +1972,7 @@ noingame icl 'artwork/talk.asm' ;---------------------------------------------- TankFont - ins 'artwork/tanksv3.fnt',+0,352 ; 44 characters only + ins 'artwork/tanksv3.fnt',+0,384 ; 48 characters only ;---------------------------------------------- font4x4 ins 'artwork/font4x4s.bmp',+62 diff --git a/scorch.bin b/scorch.bin index a0a58f5052b27609ff9e23472ff88bf7de8fd03e..26b1843ab8eabfdbfc92958bb23ddd075494f536 100644 GIT binary patch delta 6035 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 MZDfKe?(Cxf121#uB>(^b diff --git a/scorch.xex b/scorch.xex index 81de8e666bf873b4c22fc516d40d76f324791d06..fde3ec81e9ae53c03b46cf6ee5bd92c87dac194d 100644 GIT binary patch delta 5900 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 JBU?_+{y)bQYrp^i diff --git a/textproc.asm b/textproc.asm index 600d809..8bc3838 100644 --- a/textproc.asm +++ b/textproc.asm @@ -1120,7 +1120,6 @@ NoArrowDown sta difficultyLevel lda digits+1,x sta NameScreen2+7 - jsr HighlightLevel ; setting choosen level of the opponent (Moron, etc) ; clear tank name editor field - not necessary ; ldx #8 @@ -1154,12 +1153,9 @@ LastNameChar beq @+ iny @ sty PositionInName -; lda NameAdr,y -; ora #$80 ; place cursor on the end -; sta NameAdr,y - CheckKeys + jsr HighlightLevel ; setting choosen level of the opponent (Moron, etc) ldx TankNr lda JoyNumber,x tay @@ -1247,7 +1243,6 @@ ChangeOfLevelUp ; change difficulty level of computer opponent bne DoNotLoopLevelUp mva #$0 DifficultyLevel DoNotLoopLevelUp - jsr HighlightLevel jmp CheckKeys ;---- ChangeOfLevelDown @@ -1255,7 +1250,6 @@ ChangeOfLevelDown bpl DoNotLoopLevelDown mva #$8 DifficultyLevel DoNotLoopLevelDown - jsr HighlightLevel jmp CheckKeys ;---- ChangeOfLevel3Up @@ -1267,7 +1261,6 @@ ChangeOfLevel3Up sbb DifficultyLevel #9 DoNotLoopLevel3Up - jsr HighlightLevel jmp CheckKeys ;---- ChangeOfLevel3Down @@ -1275,7 +1268,6 @@ ChangeOfLevel3Down bpl @+ adb DifficultyLevel #9 @ - jsr HighlightLevel jmp CheckKeys ;---- ChangeOfShapeUp @@ -1307,6 +1299,10 @@ ShortJoyPress ldx tanknr lda DifficultyLevel sta skilltable,x + beq NotRobot + lda #$03 ; shape for robotanks + sta TankShape,x +NotRobot ; storing name of the tank in the right space ; (without cursor!) ldy #$00 From 18cce6377e3dd1a5bee3345a5bbcae47956a5574 Mon Sep 17 00:00:00 2001 From: Pecusx Date: Tue, 29 Nov 2022 11:21:35 +0100 Subject: [PATCH 05/18] Fix for lonely pixel in Liquid Dirt. --- grafproc.asm | 4 ++++ scorch.asm | 2 +- scorch.bin | Bin 32768 -> 32768 bytes scorch.xex | Bin 49327 -> 49336 bytes weapons.asm | 5 +++-- 5 files changed, 8 insertions(+), 3 deletions(-) diff --git a/grafproc.asm b/grafproc.asm index 21bf6d6..3165903 100644 --- a/grafproc.asm +++ b/grafproc.asm @@ -1362,6 +1362,9 @@ NoClearTanks adw RangeLeft #mountaintable temp adw RangeLeft #mountaintable2 tempor2 + cpw xdraw RangeRight + jcs NothingToFall + NextColumn1 mwa #0 ydraw NextPoint1 @@ -1450,6 +1453,7 @@ ColumnIsReady jeq MainFallout2 ; now correct heights are in the mountaintable sta color ; Pozor! :) we know - now A=1 +NothingToFall mva #sfx_silencer sfx_effect jsr DrawTanks rts diff --git a/scorch.asm b/scorch.asm index fd06f7f..f17bd93 100644 --- a/scorch.asm +++ b/scorch.asm @@ -15,7 +15,7 @@ ;--------------------------------------------------- .macro build - dta d"1.20" ; number of this build (4 bytes) + dta d"1.21" ; number of this build (4 bytes) .endm .macro RMTSong diff --git a/scorch.bin b/scorch.bin index 26b1843ab8eabfdbfc92958bb23ddd075494f536..942ccbf6f97073393bb9934213a26548a50c5017 100644 GIT binary patch delta 3502 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 W6zz_uN>o|dd##PF1$M4n^#1^JHtx3o delta 3393 zcmZ`*30PFu6`ngY?8_SvWRc~f5JXT=+1x;ou;qawK~c0$1jc|37CXwK!zQmR0YR@} z5y#9&dDLf$0mi1mI+}b@%mby9e8r?TA;CrrvBgOYMwG(ikNd%N*dUn1h@xQ^1Ls zLXKjJu+_^r<}lt)?pVvwQW9$uBL1<7sB9LZT%xh@3>`j3`y}JD#_{#zoJie3dEb=1 zC!Y{eSlfh0_Kqy0a6)ZI9vHlZ|Egdw89Z<`nY8&AY9zO9YfR;bIfNUv`4mDHN)_i- zzu-L_sXZhMm!L@P`FX+S=75SBTX4a!z}phMo^@I4;g*KbC{el}1j&2uOT=hMJ0E|7 z+^m}MkFEHX-LIaZlXmk<^$uJBqiKo9fL|aM3wNL>tzuy$0PfM(Oir7o~Fjf(?62D1W0z*&_84CPx zSx-?od;U%xlg<8VT*N4_K=$`xX7!{Yw3}oP<%r&QGAR zOucw43mEq}Gb3XTcrYtD2FhcKIr!f*a)e)r1D`izJYnXz4U^d|?ibECqcvjzPUsx$ z4xtGR_K@ZX?xqKO1E~u3g7M8@PZ%#7$1j4N?4Rg@XJ12_aG-4-ve_=@u zoH@Arut>W%M1c@bJ`Rl%_Y{%3utg3cCL7}Uu*hJg5wY3F%8n`Nog^bH$L(Q}-kn2W zi!aiMdX!9dj}lBBQ$nP8@?}^rY9}N-9KArUhrfcl$+A^(Xg@i)>O+*Qjar zMuKeRhjm9NrcRgc!2AJMkrQhVAx9!xw;23iwQg5RM^k5>u7?^o zCP5jGKE-W0n>m~wC2bKtQtu`ZxDt_!ZjpJB-dVm)pl)T{)CxpLjts4r>FeNA-0pfz z86^0PCOHTD3a;R& zxzDbMJjyZgL^lYP+`PS6{0B@@PKE`g?|iqA?G-L4CW}2UTwIJo$QpWty!GNy6iimf20&%( ziA@uqW{$t;Kt7H=>?iKehRQ6SEyk|KT?UF5=}iFPMFt7oPV(cT?FVbR zsC)dhUP8ZC&Ho@w7y#%LLY>`$mgb+f8xQNxHlDgi_n=arsA>ufUA^Dg2Rq; zrr3}QiF6Yeq|&)nd<7U7sOGC-vZ&!1m<%<3k-XTD#+w82c{MMEsj!AOg~_J|+>y|s zwY&*TgEhPjOpdj@tzPm1y||WcsbXFHD4sG{oq;W+ea+kGkZRV|r~+=OA+$~L0gH00 zbSg@nPw5IM^ipP{^YMx3zOr6*ryaXPj^>fS(M#O#7SexzoqZ3|<$Wfr>pP+Q zJ%H}#-5Ml;Y+8_n(Ot4OX@PUWQQ@ZXZk0)B*Q1bY!X&K8zN7$i&!fDLK_Gsg6pX$n zpC+ZFH^}njBs5M+lfz*Ab8-dhAgebI;=rAO);4| zsSJ{K5R&#fB&~?K1noO!(+ZF{=Pqc4HNZdMnM@XU4O))S#K#HQv}h?R0g2~1f){>`{riWeLWZ+0^CZN?=n_#+arc|Iy7X`B6FEZ^+lc)5`GXq1jy>&2XX{bLHc zqK0!PcB!u9%I0XREAaY)ez!wu#8S{2lJT-DQKbg?Y&t;~k=fieJ0s+6Gco3^k)aEQ ziljG@k5d=V|AD|mK*QNXa$(Vap~5bv(ln91yuu~&gpt+$9E%gSc^e%iR%tmXo*YQ) zgRc>|g_vJ%s&Av@c!&&aiL_YR9N)L18D3z-eyg8%dh>y1)0S&3hL(udy4I-XF3Wqo zwDB=-+db(wb*9fKOm=PEg6@-dwr;f!Qp<5(3vO+JR~>OlUy6Q3;?mt60nXiDTv2=c zWV^lVLjM)3qZ4rnDN5gF4#FR`&^9fkC*8~5NN^&2p|$P<3P+v9LBwWTpl7U_H|;ht z)`-#iM=j6FWNZsu_6ssub9OXRyh6=(KvAoT=_f?0l-fSU(}}%o9K_0GG^yoas|R4*?^CJ6v4^ zaoL2fX7epZLkrbyY&@o?1=M)!WD|IQ_ScoqzfCw*4ai6nXLSGuQPuzqn_3@My|4DlR!S ztF)?tefM(zmm(|oh@^c5hf0rB|MBKGw*Jv+iv0~u7e*}?N5@HzDGj3b1Zsu&q*MY-hSiPF`H%{{Yy`yjTDL diff --git a/scorch.xex b/scorch.xex index fde3ec81e9ae53c03b46cf6ee5bd92c87dac194d..0fe8b1b0b146f851ca0f95363f84168698ff167f 100644 GIT binary patch delta 3431 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 bf&Rsp0{!0~3@o&9#`eIz>y}l= Date: Wed, 30 Nov 2022 09:58:48 +0100 Subject: [PATCH 06/18] Prepare for mountains colors (test) But no memory for one "NOP" (a800) and colors array :) --- constants_top.asm | 4 +++- display_static.asm | 26 +++++++++++++------------- scorch.asm | 18 +++++++++++------- scorch.bin | Bin 32768 -> 32768 bytes scorch.xex | Bin 49336 -> 49336 bytes 5 files changed, 27 insertions(+), 21 deletions(-) diff --git a/constants_top.asm b/constants_top.asm index aa4294c..4d849d6 100644 --- a/constants_top.asm +++ b/constants_top.asm @@ -14,7 +14,9 @@ TankShapesTable .BYTE char_tank1___________ dliColorsBack :10 .by $02,$00 dliColorsFore - .by $0a + .by $0a ; one mountains color +; .by $0e,$0c,$0c,$0b,$0b,$0a,$0a,$09,$09,$08 ; mountains colors array +; .by $08,$08,$07,$07,$07,$06,$06,$06,$06,$05 CashOptionL ;(one zero less than on the screen) .by 0,<200,<800,<1200,<2000 CashOptionH diff --git a/display_static.asm b/display_static.asm index 12f00f9..f772d08 100644 --- a/display_static.asm +++ b/display_static.asm @@ -127,36 +127,36 @@ dl ; MAIN game display list .byte $4f .word display ; 1 line :76 .by $0f ;76 - .by $0f+$80 ; DLI (black bar) ;2 + .by $0f+$80,$0f ; DLI (black bar) ;3 .by $0f+$80 ; DLI - :13 .by $0f ;13 - .by $0f+$80 ; DLI (black bar) ;2 + :12 .by $0f ;12 + .by $0f+$80,$0f ; DLI (black bar) ;3 .by $0f+$80 ; DLI - :8 .by $0f ;8 + :7 .by $0f ;7 .by $4f ;1 .wo display+$0ff0 :2 .by $0f ;2 - .by $0f+$80 ; DLI (black bar) ;2 - .by $0f+$80 ; DLI - :9 .by $0f ;9 - .by $0f+$80 ; DLI (black bar) ;2 + .by $0f+$80,$0f ; DLI (black bar) ;3 .by $0f+$80 ; DLI :8 .by $0f ;8 - .by $0f+$80 ; DLI (black bar) ;2 + .by $0f+$80,$0f ; DLI (black bar) ;3 .by $0f+$80 ; DLI :7 .by $0f ;7 - .by $0f+$80 ; DLI (black bar) ;2 + .by $0f+$80,$0f ; DLI (black bar) ;3 .by $0f+$80 ; DLI :6 .by $0f ;6 - .by $0f+$80 ; DLI (black bar) ;2 + .by $0f+$80,$0f ; DLI (black bar) ;3 .by $0f+$80 ; DLI :5 .by $0f ;5 - .by $0f+$80 ; DLI (black bar) ;2 + .by $0f+$80,$0f ; DLI (black bar) ;3 .by $0f+$80 ; DLI :4 .by $0f ;4 - .by $0f+$80 ; DLI (black bar) ;2 + .by $0f+$80,$0f ; DLI (black bar) ;3 .by $0f+$80 ; DLI :3 .by $0f ;3 + .by $0f+$80,$0f ; DLI (black bar) ;3 + .by $0f+$80 ; DLI + :2 .by $0f ;2 .by $0f+$80 ; DLI (black to end);1 :38 .byte $0f ;35 ..... = 200 .by $4f diff --git a/scorch.asm b/scorch.asm index f17bd93..1964aed 100644 --- a/scorch.asm +++ b/scorch.asm @@ -1178,29 +1178,33 @@ MakeTanksVisible rts .endp ;-------------------------------------------------- -/* .proc DLIinterruptGraph +.proc DLIinterruptGraph ;sta dliA ;sty dliY pha phy ldy dliCounter lda dliColorsBack,y - ldy dliColorsFore + nop + nop + nop .IF TARGET = 800 nop ; necessary on 800 because DLIs take less time, jitter visible without it - nop + ;nop .ENDIF sta COLPF1 - sty COLPF2 +; lda dliColorsFore,y ; mountains colors array + lda dliColorsFore ; one mauntain color + sta COLPF2 inc dliCounter ;ldy dliY ;lda dliA ply pla rti -.endp */ +.endp -.proc DLIinterruptGraph +/* .proc DLIinterruptGraph pha lda dliColorsFore nop @@ -1218,7 +1222,7 @@ MakeTanksVisible sta DliColorBack pla rti -.endp +.endp */ ;-------------------------------------------------- .proc DLIinterruptOptions ;sta dliA diff --git a/scorch.bin b/scorch.bin index 942ccbf6f97073393bb9934213a26548a50c5017..c0a5e3a268d8b0769da031028d47a8d9612eba57 100644 GIT binary patch delta 7440 zcmZ`e30M?Y()2LH4c+J%hx>tm!f**5_7(7N!5gmgL3JQWqE2yL3iwNlG zgwTXmF(4*}d^-WNfpv)Hn@!Z+>_%N9vJ#?Bl69jo!N0m^L{0Vw>3*+XU9Y-cy{fXb zR8(3jYR#};P97#-`8hm1jkk&*VKTh>ayUGCF|fSNFX4F@``QQMf7$oSE+%qTy68F| zrwZy9-MTs}tINh;bRHek@TU&30gn?ol5yk28lNuij>bX6Ez>xP3OFl`%QcP5V2k55 z<1@|;hdX+wJWfQPrlO09{x>2XqHXEsQ6GA`3`rAF)l#%!HBfbvX80A9ACEF<^q2

G)%-Qfb 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 delta 7679 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 B)cODb diff --git a/scorch.xex b/scorch.xex index 0fe8b1b0b146f851ca0f95363f84168698ff167f..d0737fc33720f204caae6559e75d4713ea7f68cf 100644 GIT binary patch delta 7673 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 delta 7837 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 From 05f3f32f00d7cdd493985acbc0cb1c57fab9966d Mon Sep 17 00:00:00 2001 From: Pecusx Date: Wed, 30 Nov 2022 14:45:26 +0100 Subject: [PATCH 07/18] Minor memory tricks --- ai.asm | 5 +++-- constants.asm | 7 ++++++- constants_top.asm | 4 ---- grafproc.asm | 4 ++-- scorch.asm | 21 ++++++++------------- scorch.bin | Bin 32768 -> 32768 bytes scorch.xex | Bin 49336 -> 49332 bytes 7 files changed, 19 insertions(+), 22 deletions(-) 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 c0a5e3a268d8b0769da031028d47a8d9612eba57..e3b8011b22c4322343c01d40c1fda5dc42bc7ffd 100644 GIT binary patch delta 8002 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 delta 7961 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 diff --git a/scorch.xex b/scorch.xex index d0737fc33720f204caae6559e75d4713ea7f68cf..d8c35dd700101cad3e79e2688b7630201ad1f495 100644 GIT binary patch delta 2550 zcmZuz3se(V8s;Vt9%h;7MumWSaTOI%5g$<2BC!go46h`ptyKa@N#vno@ByN&=ZqC~ zj*lA-BxKUa5@3+08t>{RPgh4uu3(fFM1Hx=8g95!=_AlSqZ5OxPLwCMPDIC@lT;H9cGd6A&JGE8A5U; z2}_i$7ga)E6HvJ@wv-*mGj7(xG8I;7Y`^Z9M^uIqOelfQkt@K{46+h-B4s7tNnu4i(Su5~BXv3GN1vq52lvsV)HOhfmZ!}G z!AP4nJ0wQg=HKHAbqnDi3v7KuKtq~R9cKw_i5#6wo9P>z27`~2!RS_6K4?X6rq2Wq zQC|8<@CXqZrMTUfanl?7cpa_D+%VPTe8gY$WOrM;lMZr!ZPqqx6BXEf9zi{sHgFK_ zRDM6jpn`k0VW(Scy?541hXRj^UapmrZz{j!TeMHL6Ufm|sx`P(so(Z-sx;&PI-!p9 z#(DqCP2Gnuv0>yoE1 zp;Sw?V>jw2>WR#6F_`(zuo<~RU@|Boz&gd9I^d^lQt8rxng^_ zlP(aq=85e+PFg^;ZWP;ZIccr9HD7G^EM$*HksJ1aOw_U=3*0}R9qjXjw**bi4h1gs z`|L{bfO1Bk#1}i;N6NWBXBPuevYIm4Q@Plj{iA(HD(cRSz|Icl2IG(HmlqaVQ3DH2 z@IbD%nbhaH=DMY96lJYdK#WJAm3b?Jcn(LZnyTwE#eEBonMk?na5n+Fxca;hFlNK$ zjoZNh_eTB{0J6}U_fLuzt0}!Bf%7Yv55_k&Ql}iUCW`xpZ_6A_NTID>$Wf=#iP zY#?-@kRnxpR^>j0$?9Ph+F2Cst5P!`6OMPdj-n_LNJ4)r?G{j3=)|@x(O=Y5fuk3_ z*mj92R9k2;rLH4#H4O`bDoHAsj|icT5MVNWP;K7|`h* zM?nI&a;H%cxFqXX0r|zQt^#_Q7h%qG`2#j2rpACDhe+S zAA5pqMY;=ITg6)dB%mL5-<(qI$z=97bhLndn_eJb6X^MZHVc9412mw!mAVPH)zl}p zCfB;7KJ4kZ2Td)G+vwdrC&p*dVmD54KR4~~rUTscI8MCRCdRb=l+>`3Y~F+EK@T6g{nK`{-*IB9qRFDjK{;7WA)(2w9Yavaur z+7M1oQv(NUad7P@6bzs~ln!V_8)PWaKze$a;3T?h*bZXQ>gvUT1{HZ8 zITjH^Z}AaA#_D)q55)39GW7527r({hbJZ-MS|Fq6LyS#9?S|iR;Wdk1?LJNIoV|aj zQP}Hi6jmSm#{{Lf+X$*GsqB3{|Jd}#F5-aXYX{zRdVbTDX|B~gsM%f{Yt$IqjW3K{ zHEjVsF7KnyU4flX=DcjSkCAC$e7Sa_`R!Hxb!h4w-M~-w#fpp3? z>Cjw94iX#ZfNZqHm^l4jCY-3W^)fk9M@u zQ%CXCfTupsQwuOP&SA`er8kw9?>l(hR6jvBJu)VK`6@Vwo*Tn)fq|wNKg=XIl9jb+ zfhlZ)XTW;F2$QFVn4lHWrYPQ!GmJ~r>4SeZRfK1Cx$);>w@pzC{=eA9S8P^qSkKrR zm_ov4W403T42r93nS9NOP0!zst+uIjF%L?mJOQ-ZNq3CYCx=7i81*fsHrtnEHR#`%wt6U+w3vTBfjXFY zzI@{>K#v)?^ne-H!E!$M00*Dwd;$-cua>(9HH{@a7>2=!F_0C#7M#jsD8(WR=EWt0 zjsPOym$Q2;vWU&EW&_6Ny)Yxh+M_cXD;?y}{j-(GkBo$sEFOixngZQfpa#Cpa# z@coPMd5If}%MY^l?pr@f!WJvH9&Whycdtp23gtdjcgg)o5VSNgDSe$LPg`=Z>+FT@ z&mKP=nK*m?l8h}Cbi3p3!|xvd>se^hyL;+RUFrL3L==%(UfXfDUl=k+LFVfZH8Gyc z;<@}rUlt2WZeECXHIGM!n*BioSKa)9z}u_E*}_dcSt^9j@DO=SLbc+W@jCNwp>*F E2Sbo#;{X5v delta 2496 zcmZuz3sh4_8qOq;Kuo!)sX{;)UBwp)i?|?GMQT=r%OfP9U5i8>8&VN#h>EDFJ?Glm zdKDZzBq0|mOOVS$fh*evO{1`C@klpPp=y`KcA=}Qi`15NT|BxIg1T*Y?#X24oA3W; z{`)`Xo;@h|^q`>m&RV{`p8IxfzW~taLi{u^6@3+-yRBPUC9PJlBKYIW=y}g}YG;sQ^DBK|;*Z2+U$~2quHL8Y&=}_$E(c#1m_TceG?w z{4nc{$L#A=75P>?D|E^a?PGaJmk5isWJMH86&YWA98y$uzqT1#Khgf(~gIYYKhfmrv@4~ORODs+DtTNN~~Axv_{gHC9(F|X+F`IEwO%W zr*kEZITGvmM%Hk&a8ofzMfICf!QJB-zV1()CqV%j{-7Hz&)6p!Oqt#1Ey8y8k#g=& z8C!ucUPYO#3NB*vA=lWZK%JQju${x1zWDWeWX<&7UkqfP(&#Bw&CFHGL>&O0F?j`3E(rMpz>sGQAs7D(rqFqE3pq+*S z->Hn+?wVu$H?j6xRg}hd3q38kNOUT(M15^Oq;ypP zc5>JBEBVr~MB6c`Cd_}r5f_~ z?iLNb%6ml&dQep4>4elR8a&&!XO@3ds@k%J%EQ}i73KwP4Vw7*Sn{+TT+^O60f<50 z@4Y_5G#<(9Yjh}|T}S_#&#t6H_)V1rt_RS72KH&E45+Af%c-u7CGPCm$e~m9wgL3J z;*TfuXb%VN>7d09dXj@pr6rtXzfl0jxZ3y5@xd6%q>g!wC6be4*!u-Rg z;CWcEo#_%byW^|kFfqQL-1rk36KScr7lw|RWGlk(juwlShxc^u_RX}(So?_rym z5dVyUiYjFb3SO>?C)RmbE5sUHE9xp}bDfC$tn!)1{u}+@JbWq$ic8ZJ6dgo0?VW?) z^A?1y$=qIiw8?hm>u1tA%hGm~)Lr|#n=FJ(J5+x1(v4xEfApF-Wk$9pPj|HKT*sB0 zKa2@{gO^09^!rO&FaGWR!yg_$g>jqSJNd`1+usSqi&Klu+_`>H;36_vTX?L2akffV zLvPegMTvFu(5^b~Nq?w$(JWkP-2p!LdV@{?de8@_%jR{k)FaEkeLGp^UozWe*~rW; z;E>rWWj_19kolayD%;)1GLa*%I_^z)CgPqDMSG830ng_V+%@u?joE Date: Wed, 30 Nov 2022 18:40:06 +0100 Subject: [PATCH 08/18] Mountains avialiable in shadows of GREY. --- MANUAL_EN.md | 2 ++ MANUAL_PL.md | 2 ++ constants.asm | 3 +++ constants_top.asm | 7 ++----- scorch.asm | 28 +++++++++++++++++----------- scorch.bin | Bin 32768 -> 32768 bytes scorch.xex | Bin 49332 -> 49326 bytes textproc.asm | 7 +++++++ weapons.asm | 11 +++++++---- 9 files changed, 40 insertions(+), 20 deletions(-) diff --git a/MANUAL_EN.md b/MANUAL_EN.md index 9792b9e..db1f4e1 100644 --- a/MANUAL_EN.md +++ b/MANUAL_EN.md @@ -24,6 +24,8 @@ On the first screen, you can configure gameplay options: Select options with cursor keys or a joystick. +The [TAB] key, and on the Atari 5200 console the [5] controller key change the color of the mountains. + The [RETURN] key or a joystick button moves to the next screen. ## 2. Entering the name of players and selecting the level of computer-controlled players diff --git a/MANUAL_PL.md b/MANUAL_PL.md index f9790aa..98ad537 100644 --- a/MANUAL_PL.md +++ b/MANUAL_PL.md @@ -23,6 +23,8 @@ Na pierwszym ekranie możemy skonfigurować opcje rozgrywki: Wybór opcji klawiszami kursora lub joystickiem. +Klawisz [TAB], a na konsoli Atari 5200 klawisz [5] kontrolera zmieniają kolor gór. + Klawisz [RETURN] lub przycisk Joysticka przechodzi do następnego ekranu. ## 2. Wprowadzanie nazwy graczy i wybór poziomu graczy sterowanych przez komputer diff --git a/constants.asm b/constants.asm index 8689ee9..d438c99 100644 --- a/constants.asm +++ b/constants.asm @@ -59,6 +59,9 @@ areYouSureText lineClear dta d" " +TankColoursTable .BYTE $58,$2a,$96,$ca,$7a,$ed +;TankStatusColoursTable .BYTE $54,$24,$92,$c4,$74,$e4 ; standard order +TankStatusColoursTable .BYTE $74,$c4,$24,$e4,$54,$94 ; Adam's order ;----------- pmtableL ; addressess of the P/M memory for 6 tanks .by <(pmgraph+$400) diff --git a/constants_top.asm b/constants_top.asm index c17e2f3..ed9232e 100644 --- a/constants_top.asm +++ b/constants_top.asm @@ -2,17 +2,14 @@ .IF *>0 ;this is a trick that prevents compiling this file alone -TankColoursTable .BYTE $58,$2a,$96,$ca,$7a,$ed -;TankStatusColoursTable .BYTE $54,$24,$92,$c4,$74,$e4 ; standard order ;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 dliColorsBack :10 .by $02,$00 dliColorsFore .by $0a ; one mountains color -; .by $0e,$0c,$0c,$0b,$0b,$0a,$0a,$09,$09,$08 ; mountains colors array -; .by $08,$08,$07,$07,$07,$06,$06,$06,$06,$05 + .by $0e,$0c,$0c,$0b,$0b,$0a,$0a,$09,$09,$08 ; mountains colors array + .by $08,$08,$07,$07,$07,$06,$06,$06,$06,$05 CashOptionL ;(one zero less than on the screen) .by 0,<200,<800,<1200,<2000 CashOptionH diff --git a/scorch.asm b/scorch.asm index 55be6ee..fce0b98 100644 --- a/scorch.asm +++ b/scorch.asm @@ -26,8 +26,9 @@ ;--------------------------------------------------- icl 'definitions.asm' ;--------------------------------------------------- -FirstZpageVariable = $61 +FirstZpageVariable = $60 .zpvar DliColorBack .byte = FirstZpageVariable + .zpvar Gradient .byte .zpvar JoystickNumber .byte .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) @@ -1180,16 +1181,18 @@ MakeTanksVisible phy ldy dliCounter lda dliColorsBack,y - nop - nop - nop - .IF TARGET = 800 - nop ; necessary on 800 because DLIs take less time, jitter visible without it - nop - .ENDIF + bit Gradient + bmi GoGradient + ldy #$ff +GoGradient + iny +; .IF TARGET = 800 +; nop ; necessary on 800 because DLIs take less time, jitter visible without it +; nop +; .ENDIF sta COLPF1 -; lda dliColorsFore,y ; mountains colors array - lda dliColorsFore ; one mauntain color + lda dliColorsFore,y ; mountains colors array +; lda dliColorsFore ; one mauntain color sta COLPF2 inc dliCounter ;ldy dliY @@ -1226,8 +1229,11 @@ MakeTanksVisible ; lda dliColorsBack lda #0 sta COLPF1 + lda dliColorsFore+1 + bit Gradient + bmi @+ lda dliColorsFore - sta COLPF2 +@ sta COLPF2 pla rti .endp diff --git a/scorch.bin b/scorch.bin index e3b8011b22c4322343c01d40c1fda5dc42bc7ffd..220b344119c1446dadc2b3443ea200c48939a46d 100644 GIT binary patch delta 7954 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 delta 8170 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 qJ%*z#R2^n7c;UPYOaBjUrP@#c diff --git a/textproc.asm b/textproc.asm index 8bc3838..8bebe1b 100644 --- a/textproc.asm +++ b/textproc.asm @@ -110,7 +110,14 @@ OptionsNoRight cmp #@kbcode._ret ; $c ;Return key bne OptionsNoReturn jmp OptionsFinished + OptionsNoReturn + cmp #@kbcode._tab ; Tab key + bne OptionsNoTab + lda Gradient + eor #$80 + sta Gradient +OptionsNoTab jmp OptionsMainLoop OptionsFinished diff --git a/weapons.asm b/weapons.asm index 627a097..c1289c5 100644 --- a/weapons.asm +++ b/weapons.asm @@ -102,11 +102,13 @@ CheckNextTankBFG mva #17 ExplosionRadius jsr xmissile - ; soil must fall down now! there is no other way... + jsr SecondRepeat + +/* ; soil must fall down now! there is no other way... ; hide tanks or they fall down with soil jsr SoilDown2 - ; it looks like force is divided by 4 here BUT" + ; it looks like force is divided by 4 here BUT" ; in Flight routine force is multiplied by 2 and left ; so, we have Force divided by 2 here (not accurately) lsr Force+1 @@ -123,8 +125,9 @@ CheckNextTankBFG mva #15 ExplosionRadius jsr CalculateExplosionRange0 mva #sfx_baby_missile sfx_effect - jsr xmissile.NoRangeCalc + jsr xmissile.NoRangeCalc */ +SecondRepeat ; soil must fall down now! there is no other way... ; hide tanks or they fall down with soil jsr SoilDown2 @@ -142,7 +145,7 @@ CheckNextTankBFG jsr Flight lda HitFlag beq EndOfLeapping - mva #13 ExplosionRadius + mva #14 ExplosionRadius jsr CalculateExplosionRange0 mva #sfx_baby_missile sfx_effect jmp xmissile.NoRangeCalc From 166d05c0e64e7cef05d7e02c08d8928fec060720 Mon Sep 17 00:00:00 2001 From: Pecusx Date: Wed, 30 Nov 2022 18:47:30 +0100 Subject: [PATCH 09/18] One NOP more and manuals update --- MANUAL_EN.md | 2 +- MANUAL_PL.md | 2 +- scorch.asm | 6 +++--- scorch.xex | Bin 49326 -> 49327 bytes 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/MANUAL_EN.md b/MANUAL_EN.md index db1f4e1..64781a4 100644 --- a/MANUAL_EN.md +++ b/MANUAL_EN.md @@ -135,7 +135,7 @@ And here are the values of maximum energy loss for individual weapons. If a weap | Missile | 136 | | Baby Nuke | 200 | | Nuke | 240 | -| LeapFrog| 136 120 104 | +| LeapFrog| 136 112 112 | | Funky Bomb | 168 88 (* 5) | | MIRV | 136 (* 5) | | Death's Head | 240 (* 5) | diff --git a/MANUAL_PL.md b/MANUAL_PL.md index 98ad537..13d1559 100644 --- a/MANUAL_PL.md +++ b/MANUAL_PL.md @@ -134,7 +134,7 @@ A oto wartości maksymalnego ubytku energii dla poszczególnych broni. Jeśli br | Missile | 136 | | Baby Nuke | 200 | | Nuke | 240 | -| LeapFrog| 136 120 104 | +| LeapFrog| 136 112 112 | | Funky Bomb | 168 88 (* 5) | | MIRV | 136 (* 5) | | Death's Head | 240 (* 5) | diff --git a/scorch.asm b/scorch.asm index fce0b98..76a3165 100644 --- a/scorch.asm +++ b/scorch.asm @@ -1186,10 +1186,10 @@ MakeTanksVisible ldy #$ff GoGradient iny -; .IF TARGET = 800 -; nop ; necessary on 800 because DLIs take less time, jitter visible without it + .IF TARGET = 800 + nop ; necessary on 800 because DLIs take less time, jitter visible without it ; nop -; .ENDIF + .ENDIF sta COLPF1 lda dliColorsFore,y ; mountains colors array ; lda dliColorsFore ; one mauntain color diff --git a/scorch.xex b/scorch.xex index f60a6b5d63cafad54fd8877d316bd6d6dfc2878e..ba1ee8e4d9f34955ad0657e6e6916c65b7b45064 100644 GIT binary patch delta 7719 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
X)Y%$AW7KXrtz14 zf^VY?$7JU7QHH z+X;);ld|xeMbmtD?+5)Xtf5fw085d50)!$E+*DLZHR1_7CQ|h{Y{$A;;T*J2EG)c; z72yRY25L5x6UGjYlpw{)aF+%T`;vyjTe+dUz=IKd9;)TUys2ChuJd@go_Z5eZwCzY~>tn8+{*nf=5N9?RpD#wwHR^>? zAlv=vb(xZ9(_!5|;#{P4i{ML3+PibY=;6`0;n6(DXiq8Z(j*MQ%N(;I9L&Z5?t$S4 zvQazD{*J3lSZXf5T(T6NLEQKPIq?V=Qv&*VxyE7GLvZ}lGX@R~9O4i4SgL-693$K) zJtV;-$UPDvghInZZ_;O)LqgO4l~~^en>a&e;ocP1DoUzq5LF6(Vu3bwM&PXK;m?K4W_bqc6*Bzeq3W!3A~O+(iX+;owf# zC%nR)(?D0w-7)`EV_P74KxYwMh-Kd_vw4Xjq|NwHYM_wX5f+3_A@rPLvx0l*0>&BD z)ksZ7_(0_P!5-gftAv%Nl-u^eYeTv1FuYb(1TBCL$D20tk>{67jgRx?Qj?>!TxxmL zR!B{e;0jwHkZh^2&4*Wc1$%F&d8;glhStc4R#+mut2~C?TSl&X&TMUkD`;k9?_qgG z@Py+#t$DODleXs2#xxrAkm^EJswd2_)djtj&U>e-$?QE&`waoM@DGJ5qa>Th^Ii`ZZn|OgK|LF)4kMMtF zkx)*5&JUM5!f$z!2rt~_R}fljzv?ih@Ep+;QU?S*H({Ky9PD?woCW}t-NQr=!^bHM z^Y-Y4nb&V%lWVH`9- ztmXLPt{8~(FYiwGuGQ@VIIZ~lzcM4_4mfd6U3_~Qv;4;IT9&@$9ltTuTP2(o@*-n= zsWRBTu+kQ2CzFwTW>C?1$)1;%4IN$Rd^|qA{4pqQ|HdVdY^Lb~^SFp4=?Gqq@AHQ< zPZ*DLeS{ew+e2EYxA)A1XJFM1$^*AnE%aDaYgIu(4<%npI2cQAi)3mj@2j$iD^)dJ1$dZ{5&Gka9n2rPFzwJl)xEd=bme-;y zbttqRE_Rh)(Bvxc{TH--JY2z`dw-<{THnyqwc)@iS8B*jmexGkl=>hppy@ZZiOIz>ONf+I;1O;AEF1gLKKq_ zo>CN)aO@=fh>A!YOEuuez2ir1%K@?DI1|Kpn^GKqQ!wIF`+O6m<aUiM%3QFw7{C86av>xdMU!A5N3s6k5KUH<3VPPOPa+vAmn7>PVwATk~n{ zH?=8sLG=;!rusYe@7I!mA+Ne`^S0azdeGV>vDAiX;8y_dtgzCM3%`pP^hyC4wkZW? z!*(UQiNCK?Q>$=b{VU^du0sA1{8{6ACB$4~vJ$T9#?4ApW7HtA4*gySzd7x!pBj3s z4rB!rSrn0Vl*p2SEV%7}1fbrKrQcCe)6g`^cl?y;vtM0`uHYN>5wz46l|+TsvzzKL zYVh@W5+*nyzXqvA+5o?jZEpxB3bh(-t`^cmEC=&|7NPZjB^~a-atx?i52*OFsgJ3CKR9{hcfi>UoXt?6^Sx);T{zSj@b;WtaH;fc>+7?wIv8eM zc`!_~?%?@@PR1bk`wsjKGHP16?4?VWa=N-8@akpJ&AM4LR@>v)s)PTDn7Z2jMss!- zH0gC+jrc=j(5zt}=z0*X%GBAQRE1Wz4x$6`fdKGN3T!WR8-U2apr&SsL=G4>(aL$IP|gYd)YIS7su!C|Mcv? z-N(*etm6!wpI`jRbLw>U!tjXbw=~<|7c3w5ULCya<{R+*t8p6(Odo!A{?gU{o8D?R z!_fT6iLdYe>bEGp;yvNyJ+Cpd=f9bhS8tU5G)jLur?#@L)G@rReed%Yf%`ZAt51hu z{Mpyq>uV3NQKGN4(N~ps+E;b7&o}q)g0a!J>wM?T57m^bV-q;rGS5p9Wtt8>5YxUU M_~os$+hV8xAL7k*lmGw# From 403288548ce0c4dd178dfd93082cbb03ce7ae186 Mon Sep 17 00:00:00 2001 From: Pecusx Date: Wed, 30 Nov 2022 19:15:44 +0100 Subject: [PATCH 10/18] Minor manuals update --- MANUAL_EN.md | 2 +- MANUAL_PL.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/MANUAL_EN.md b/MANUAL_EN.md index 64781a4..e4d0239 100644 --- a/MANUAL_EN.md +++ b/MANUAL_EN.md @@ -24,7 +24,7 @@ On the first screen, you can configure gameplay options: Select options with cursor keys or a joystick. -The [TAB] key, and on the Atari 5200 console the [5] controller key change the color of the mountains. +The [TAB] or [SELECT] key, and on the Atari 5200 console the [5] controller key change the color of the mountains. The [RETURN] key or a joystick button moves to the next screen. diff --git a/MANUAL_PL.md b/MANUAL_PL.md index 13d1559..4a746ce 100644 --- a/MANUAL_PL.md +++ b/MANUAL_PL.md @@ -23,7 +23,7 @@ Na pierwszym ekranie możemy skonfigurować opcje rozgrywki: Wybór opcji klawiszami kursora lub joystickiem. -Klawisz [TAB], a na konsoli Atari 5200 klawisz [5] kontrolera zmieniają kolor gór. +Klawisz [TAB] lub [SELECT], a na konsoli Atari 5200 klawisz [5] kontrolera zmieniają kolor gór. Klawisz [RETURN] lub przycisk Joysticka przechodzi do następnego ekranu. From 8c6fee063171eda0fa9018ee6e6f32156a4206ff Mon Sep 17 00:00:00 2001 From: Pecusx Date: Thu, 1 Dec 2022 08:49:02 +0100 Subject: [PATCH 11/18] Different game title for A5200 --- display_static.asm | 8 ++++++++ scorch.asm | 4 ++-- scorch.bin | Bin 32768 -> 32768 bytes scorch.xex | Bin 49327 -> 49329 bytes 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/display_static.asm b/display_static.asm index f772d08..3ac51ff 100644 --- a/display_static.asm +++ b/display_static.asm @@ -102,7 +102,15 @@ EmptyLine dta d" " ;--------------------------------------------------- OptionsTitle +.IF TARGET = 800 dta d" scorch "* +.ELIF TARGET = 5200 + dta d" scorch "* + dta d"5" + dta d"k"* + dta d"2" + dta d" "* +.ENDIF DifficultyTitle dta d" difficulty "* PurchaseTitle diff --git a/scorch.asm b/scorch.asm index 76a3165..5457a72 100644 --- a/scorch.asm +++ b/scorch.asm @@ -483,8 +483,8 @@ NoGameOverYet RmtSong song_ingame - jsr SetPMWidth ; A=0 !!! - ;lda #0 + jsr SetPMWidth ; A=0 + lda #0 sta AfterBFGflag ; reset BFG flag sta COLOR2 ; status line "off" sta COLOR1 diff --git a/scorch.bin b/scorch.bin index 220b344119c1446dadc2b3443ea200c48939a46d..3d18efed07677ea381adca7a598cabc0c63b3b33 100644 GIT binary patch delta 7963 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 C5kF!8 diff --git a/scorch.xex b/scorch.xex index ba1ee8e4d9f34955ad0657e6e6916c65b7b45064..71df619ed90941afbed9ec7064c1ea122dd7b39c 100644 GIT binary patch delta 7874 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 E1BH01YybcN delta 7816 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 From c7e65f1d61ae10d32a3f661eaffb9e536e6bbba3 Mon Sep 17 00:00:00 2001 From: Pecusx Date: Thu, 1 Dec 2022 15:23:39 +0100 Subject: [PATCH 12/18] Display active joystick on weapon purchase/activation screens and game screen. --- MANUAL_EN.md | 1 + MANUAL_PL.md | 1 + display_purchasedl.asm | 2 +- display_status.asm | 2 +- scorch.bin | Bin 32768 -> 32768 bytes scorch.xex | Bin 49329 -> 49341 bytes textproc.asm | 22 ++++++++++++++++------ 7 files changed, 20 insertions(+), 8 deletions(-) diff --git a/MANUAL_EN.md b/MANUAL_EN.md index e4d0239..f1c9aa3 100644 --- a/MANUAL_EN.md +++ b/MANUAL_EN.md @@ -52,6 +52,7 @@ Another [RETURN] key or joystick button press switches to the next player's shop The status line shows which player is currently allowed to take a shot and a set of other information: * player's tank name, +* active joystick number * currently selected offensive weapon, * the player's remaining energy points and if he has an active defensive weapon that has its energy - in parentheses the energy level, * the angle and the direction of the barrel set by the player, diff --git a/MANUAL_PL.md b/MANUAL_PL.md index 4a746ce..b47309d 100644 --- a/MANUAL_PL.md +++ b/MANUAL_PL.md @@ -51,6 +51,7 @@ Klawisz [RETURN] lub przycisk joysticka przechodzi do ekranu zakupów następneg W linii statusowej widoczna jest informacja o tym który z graczy aktualnie może oddać strzał oraz zestaw innych informacji: * nazwa czołgu gracza +* numer aktywnego joysticka * wybrana aktualnie broń ofensywna * pozostała ilość punktów energii gracza i jeśli ma on aktywną broń defensywną posiadającą swój zasób energii - w nawiasie ten zasób * ustawiony przez gracza kąt nachylenia lufy i kierunek jej nachylenia diff --git a/display_purchasedl.asm b/display_purchasedl.asm index 8435275..f2d8353 100644 --- a/display_purchasedl.asm +++ b/display_purchasedl.asm @@ -3,7 +3,7 @@ .IF *>0 ;this is a trick that prevents compiling this file alone ;--------------------------------------------------- purchaseTextBuffer - dta d"Player: Cash: 0" ; ZERO TO MAKE YOU RICHER ON THE SCREEN + dta d"Player: * Cash: 0" ; ZERO TO MAKE YOU RICHER ON THE SCREEN ; DLs fragments (modified by game code) ; all Purchase DL :) diff --git a/display_status.asm b/display_status.asm index c3f5c68..30f26ae 100644 --- a/display_status.asm +++ b/display_status.asm @@ -4,7 +4,7 @@ statusBuffer ; 0123456789012345678901234567890123456789 - dta d"Player: " + dta d"Player: * " dta d"Energy: Angle: Force: " dta d"Round: Wind: " diff --git a/scorch.bin b/scorch.bin index 3d18efed07677ea381adca7a598cabc0c63b3b33..41bceaee73e1b6abeacc4fa278b71e1206ca02fc 100644 GIT binary patch delta 6081 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 NezsDduR1W{{{iL6Kx+U1 delta 6100 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 diff --git a/scorch.xex b/scorch.xex index 71df619ed90941afbed9ec7064c1ea122dd7b39c..da43f0961727f23fe0d1cd29e52e4bec22a7ecd3 100644 GIT binary patch delta 6052 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 Tk@pWyv)iNZy8h*Zxnuti9b=4! delta 6199 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 We%k1f`x&b` Date: Thu, 1 Dec 2022 15:35:30 +0100 Subject: [PATCH 13/18] New name of game :) --- display_static.asm | 11 ++++++----- scorch.bin | Bin 32768 -> 32768 bytes 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/display_static.asm b/display_static.asm index 3ac51ff..f6769fc 100644 --- a/display_static.asm +++ b/display_static.asm @@ -105,11 +105,12 @@ OptionsTitle .IF TARGET = 800 dta d" scorch "* .ELIF TARGET = 5200 - dta d" scorch "* - dta d"5" - dta d"k"* - dta d"2" - dta d" "* + dta d" scorch supersystem "* +; dta d" scorch "* +; dta d"5" +; dta d"k"* +; dta d"2" +; dta d" "* .ENDIF DifficultyTitle dta d" difficulty "* diff --git a/scorch.bin b/scorch.bin index 41bceaee73e1b6abeacc4fa278b71e1206ca02fc..e160ec4d57fb8e8f5b75d7116142ff509145167a 100644 GIT binary patch delta 33 rcmV++0N($AfC7Mk0 Date: Thu, 1 Dec 2022 11:31:35 -0500 Subject: [PATCH 14/18] SUPERSYSTEM everywhere + one space more --- display_main_menu.asm | 4 ++-- scorch.asm | 4 +--- scorch.bin | Bin 32768 -> 32768 bytes scorch.xex | Bin 49341 -> 49341 bytes textproc.asm | 2 +- 5 files changed, 4 insertions(+), 6 deletions(-) diff --git a/display_main_menu.asm b/display_main_menu.asm index 5833478..44ae147 100644 --- a/display_main_menu.asm +++ b/display_main_menu.asm @@ -29,9 +29,9 @@ OptionsScreenEnd ;----------------------------------------------- NameScreen2 - dta d" Tank 1 *1 +1 Name:" + dta d" Tank 1 *1 +1 Name:" NameAdr - dta d" " + dta d" " NameScreen4 dta d" " NamesOfLevels diff --git a/scorch.asm b/scorch.asm index 5457a72..68b3235 100644 --- a/scorch.asm +++ b/scorch.asm @@ -2069,9 +2069,7 @@ MODULEND .ENDIF org ROM_SETTINGS ; 5200 ROM settings address $bfe8 ; "01234567890123456789" - .byte " scorch 5200 v" ;20 characters title - build ; " " - .byte " " + .byte " scorch supersystem " ;20 characters title .byte "7A" ;2 characters year .. 1900 + $7A = 2020 .word FirstSTART .ELSE diff --git a/scorch.bin b/scorch.bin index e160ec4d57fb8e8f5b75d7116142ff509145167a..98c0329048b93baac20b31422c8a3c81d8afb72d 100644 GIT binary patch delta 181 zcmZo@U}|V!+EB{M#lS7dz@V3yn<}-rp0z-Zt6%ZOi31!LzU=Iu{8L$-v3;_liX~sa zqGtUC##4QZ1y(Z5?Vp^XvLFy7)FJR=#RtI!3_C%bxf(oRou3l+P7Q@|z9cMQ2g@E{ zxWJ@oe`c}31t!jhnf;0#0xuF)O0+IeFi2gqSYVMF(7H%fSH}Ly^Hr4@`!^p})r}G; UE-gqcDy}RpNzG*tS6t}@0FeSo3IG5A delta 181 zcmZo@U}|V!+EB{M#VyF7mzbL>#lWz+p0z-Zt5@;Gi31!LzU=Is{8L$-v2C)ViX~sK zqGtUC##4QZ1y(Z5?VX&VvLFy7)FJR=#RtI!3_C%bxf(oRou3l+P7Q@|z9cMQ2g@E{ zxWJ@oe`c}31t!jhnZ1e~0xuF)O0+IeFi2gqSYVMF(7H%fSH|AS^Hr4@dp93e)r}Gm U6%r6&U?>yh6B1+)S6t}@0AV0S9smFU diff --git a/scorch.xex b/scorch.xex index da43f0961727f23fe0d1cd29e52e4bec22a7ecd3..29f58ca9fefb9056e6918db8c0d2fe73cc05a1bb 100644 GIT binary patch delta 170 zcmdnn$h^0ac|)BW7X!B-1A|^-ZmQJg4!6Z}T>XkKP8{I4@MUNJWYbi2#`ejvsq&2d zlWSA0`1%z!>n|{#>RT+Zl3{ND_5i~LCQbV@iv=z)aW>5CSL_gYk+4#tb%8>8>YBv@i`0OYZcXz5TK6wanX!Mf IQu^#j09ZdrY5)KL delta 170 zcmdnn$h^0ac|)BW7q=jTUSe*l6a&NN4!6Z}T)m1fP8{I4@MUN3WYbi2#n|{#>RT+Zl3{M|_5i~LCQbV@iv=z)aW>5CRqPOWk+4#tb%8>8>YBv@i`0OYZcXz5TK6wanXz}X IQu^#j08@lWQ2+n{ diff --git a/textproc.asm b/textproc.asm index 7357d07..33f08d1 100644 --- a/textproc.asm +++ b/textproc.asm @@ -1176,7 +1176,7 @@ CheckKeys lda TankShape,x tay lda digits+1,y - sta NameScreen2+14 ; display tank shape number + sta NameScreen2+15 ; display tank shape number jsr CursorDisplay jsr getkey bit escFlag From b4af765f4faf9756063979a7cc2afbce150e250f Mon Sep 17 00:00:00 2001 From: Pecusx Date: Thu, 1 Dec 2022 20:35:51 +0100 Subject: [PATCH 15/18] New (better?) layout of shades of gray. --- constants_top.asm | 6 ++++-- scorch.bin | Bin 32768 -> 32768 bytes scorch.xex | Bin 49341 -> 49341 bytes 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/constants_top.asm b/constants_top.asm index ed9232e..79869b9 100644 --- a/constants_top.asm +++ b/constants_top.asm @@ -8,8 +8,10 @@ dliColorsBack :10 .by $02,$00 dliColorsFore .by $0a ; one mountains color - .by $0e,$0c,$0c,$0b,$0b,$0a,$0a,$09,$09,$08 ; mountains colors array - .by $08,$08,$07,$07,$07,$06,$06,$06,$06,$05 +; .by $0e,$0c,$0c,$0b,$0b,$0a,$0a,$09,$09,$08 ; mountains colors array +; .by $08,$08,$07,$07,$07,$06,$06,$06,$06,$05 + .by $0e,$0c,$0c,$0c,$0c,$0a,$0a,$0a,$0a,$08 ; mountains colors array new + .by $08,$08,$08,$06,$06,$06,$06,$06,$06,$04 CashOptionL ;(one zero less than on the screen) .by 0,<200,<800,<1200,<2000 CashOptionH diff --git a/scorch.bin b/scorch.bin index 98c0329048b93baac20b31422c8a3c81d8afb72d..e1b6c5a3d98ee9e916e6eb5ccfe0b081f0b72f5b 100644 GIT binary patch delta 31 gcmZo@U}|V!+OVu%kcWp02snU%4GdT&Z?E?R0Cj=}g#Z8m delta 31 lcmZo@U}|V!+OVu%kei!}i<6UsgM*!&oec?q diff --git a/scorch.xex b/scorch.xex index 29f58ca9fefb9056e6918db8c0d2fe73cc05a1bb..8bcf2ece3c57baa313eab107f486193526c2dafe 100644 GIT binary patch delta 31 gcmdnn$h^0ac|+v^K^`71Am9K3HZWkB+;zYh0ELAI6#xJL delta 31 lcmdnn$h^0ac|+v^L2hm?E>2Dk4i0v9b~Yejo!oW67yyMy2NM7Q From c6264013d90f1874b6e931d91962fcd7ba9af88b Mon Sep 17 00:00:00 2001 From: Pecusx Date: Fri, 2 Dec 2022 15:05:07 +0100 Subject: [PATCH 16/18] RoboTanks do not use Laser and BFG (in extremely rare case) --- ai.asm | 2 +- scorch.bin | Bin 32768 -> 32768 bytes scorch.xex | Bin 49341 -> 49341 bytes 3 files changed, 1 insertion(+), 1 deletion(-) diff --git a/ai.asm b/ai.asm index 9cd889a..25d6649 100644 --- a/ai.asm +++ b/ai.asm @@ -1027,7 +1027,7 @@ SorryNoPurchase ; choose the best weapon ; X - TankNr ;---------------------------------------------- - ldy #last_offensive_____+1 ;the last weapon to choose +1 + ldy #last_offensive_____-1 ;the last weapon to choose +1 (ind_Dirt_Charge____ - not Laser :) ) NotFromAll ; Y - the last offensive weapon to use + 1 lda TanksWeaponsTableL,x diff --git a/scorch.bin b/scorch.bin index e1b6c5a3d98ee9e916e6eb5ccfe0b081f0b72f5b..836759a626e36d72148d5da7ffec9e2b36ce5f68 100644 GIT binary patch delta 16 XcmZo@U}|V!+F%pQD7V=*_OKEFFcSrz delta 16 XcmZo@U}|V!+F%pQsIb{K_OKEFFdqe> diff --git a/scorch.xex b/scorch.xex index 8bcf2ece3c57baa313eab107f486193526c2dafe..5277c31fc38d0cedad55e695434af32be0ecc8fe 100644 GIT binary patch delta 16 Ycmdnn$h^0adBgU3jB=ZI%wtso06xA3*8l(j delta 16 Ycmdnn$h^0adBgU3j0&4~%wtso06xkF*#H0l From f485d120c86c831c9670199181325dd77ddc9cc8 Mon Sep 17 00:00:00 2001 From: Pecusx Date: Fri, 2 Dec 2022 18:14:16 +0100 Subject: [PATCH 17/18] Moroon at very specific settings kills everyone :) - check it out! --- ai.asm | 15 ++++++++------- scorch.bin | Bin 32768 -> 32768 bytes scorch.xex | Bin 49341 -> 49340 bytes 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/ai.asm b/ai.asm index 25d6649..27f2671 100644 --- a/ai.asm +++ b/ai.asm @@ -82,7 +82,10 @@ AIRoutines mwa #80 RandBoundaryLow mwa #800 RandBoundaryHigh jsr RandomizeForce - rts + ; choose the best weapon + ldy #ind_Buy_me_________+1 ; if the cheat is active it will fire the BFG :) + jmp ChooseBestOffensive.NotFromAll + ;rts .endp ;---------------------------------------------- .proc Shooter @@ -156,8 +159,8 @@ endo ; choose the best weapon - jsr ChooseBestOffensive - rts + jmp ChooseBestOffensive + ;rts .endp ;---------------------------------------------- .proc Poolshark @@ -197,9 +200,7 @@ forceNow ldx TankNr jsr RandomizeForce -endo - ;ldx TankNr ;this is possibly not necessary - +endo ; choose the best weapon jsr ChooseBestOffensive @@ -1027,7 +1028,7 @@ SorryNoPurchase ; choose the best weapon ; X - TankNr ;---------------------------------------------- - ldy #last_offensive_____-1 ;the last weapon to choose +1 (ind_Dirt_Charge____ - not Laser :) ) + ldy #ind_Dirt_Charge____+1 ;the last weapon to choose +1 (not BFG or Laser :) ) NotFromAll ; Y - the last offensive weapon to use + 1 lda TanksWeaponsTableL,x diff --git a/scorch.bin b/scorch.bin index 836759a626e36d72148d5da7ffec9e2b36ce5f68..8ffb1ecc7d876316af1f57d17290061914d64b32 100644 GIT binary patch delta 739 zcmZo@U}|V!+AvF&@%`r6vMnr(oRbxl#2HUawor;;^xr&HDVIgiby@4Cy*rk*ZhiqG zOZU2N7FLfFW{lZfWaZ4rcxUrA>n<^to*4@FC%Xh?Gip!X5R?Wcr6wB&n=^V&P7INn z+#GzD(Q|WR$UP?RmgyohuFm*3!)NBK$zI`RtPA9Q9Oh1L3^!x^H+e^R7`KnzT!oq$ z3d?6Ga88zr&|}P*>=_{|YBx6_tEj4}YtpPmLQ+cFMpjN<3O$pnBO=*>YVXhRk)C`z zLP-eBUdfg!=qlL9wq z0gHme+@(wAX7evyI=7HtA!PHeNLEIckl6~SCLfN{;Xg9VV(HbFtgTm9vbI(L#r{R9 zGyb2f7OlxrKMTkWj@IE1nJuyOY9>NSU$nYl|7?q;OMu#zY+yRJ^w?D&^U24ewGIEy z_SpMpwnqZ@oYpyO=3E6rj=3Cjug*zW(OT-|<<(j;Lz8{Q&a%)YC6@7FACi1*CM(6{ z+o;W1$a*)*1yvp%o9x^vpx15Z9M@`_07+J(f{bS=st&=?}@+$=-RA>;)_5&Xd~Nx;Z;n<^t&KU}KCc6Y>GiprU5R?Wcr6wB&n=`siP7INn z+#GzD(QR{L$UP?RhUtPcF3tEo!*k~J$zI`Rj0uxlf#k2rd&0wb6s+eaC{)f+STaL_ zZL(~H9%JTYp9on|plDW6Ra4ibS&M|El(dbkoV*k|C)Y(pvIEuLnc*Wb`Cf#Q5SYD^ zLE-4kp2PeKKC=|8CksXD%LmRq$+m%YCBxiKez4hhW}vD`h}74^q9z4y&H@$%+qp}Z z%+2Osx^!+Kze3>Vy^*YpEP=BXj!!-orNe)4mc`PmFIii!u4HYk0E#h2t26$YtQoDz zQZoz44U5*{51cKr^lBzT$;4=N!JgR`OP2t(E!n_yZ0WJ9J|>e-Mr(`zn(eXo=WLGz zjyX+pR?fKugsgK}=U$r39V5wTIaxI(-$r@PN|x5DwOp@HGEVq;l7GWj1?4%%sxG`s zSe6G8R0IlYK?PT`Ar#7i#3o;ekum`(7kIaqi=PWk7Ay`l1}NnPk%AeRLz>Jt=jfpZ`+Z_&l&jDoaVy8ym^z4q!~>9oF=%LHT^f!=D(R6nSrTfeeM*F f$d#?1mi~~8n(Un?$)3A%?mVfTO`EgxrV0W8Mqov! diff --git a/scorch.xex b/scorch.xex index 5277c31fc38d0cedad55e695434af32be0ecc8fe..d98b310200cc12ed32a9e9df8c74092775db386f 100644 GIT binary patch delta 850 zcmZvX4M2IV26$D za__oF3Lkv6)a?+8a&op~eZoY=DGW;yBCfZF$`>h+23;@@yA2zgad@(sSi5Clop7r8 z`&z|?<(2{I){m_wDw#IYU9^OO9_pZ?J%X?yxJn(uj4+ATZ6P=WrYR6ag96w>Ym!DO za-5HAC|C1XgGtTzHdLs2X+x#jmJdE<01oM|7MW`5?l2u8`0m)mV<}p&2*1!50z{8A zny99rhKUSWYj_FJF!lW^(9Hl2)-efDF68xdDtHO1Rq1_?rqO>f=!lh@NrX)d4p$hJ z=0CJ?!?9fsY{<%?YbvW16{>(sIA~U2a+ewGhsW7CRgC$Fb$mu4{zXBSiCQ_k7rO%Q zveELljMxr~h|3&i9nalF0@2>!WpRxY*EpxtWA%&^2%bc-2eR07w}DO97qYW#2uc<+ zU(95rx09t>t(GjIqW$eXXEM2xqla}12BHHZRB)o6<>jR5fpXM~HGT7{oXen|^_WKH z^tODT7%7S|>mu*B3GVs>!YWH>xNl|KoLi|<{zJeD3%;XxW2#)AOGH;7Iur{|OHg3d z*yOAERoNb`F1y%N4LMi;o6nM%#8gA!jm8J=!HJ*hsH3{lCi~EPIi5i1Znm}!jLrG& zJdvtBciEVoSJc@3xNq>q(hpg9T+*@gB~`b(p1z))U;4TVw3lky9(iBBlPNWsH(25E zq<=&_aW=Q?mIL|1@;d_7&o&{|J}ebN9Yr#16xKd$-q**Ii`JF!eja_n-5z`)(ur2B}TAJQ6AML}^`I14pq6kfx+KN;XBFQ-=G{u*pXue``Azu-n ziMx0AF0IXW?ZvVCVJa@AY_Sm2ViXEx7BNXwB*RrgcP2{FIdIN%{{P=OpPrFMfwfU! znv?N=G3>l-Apl8dC$2W5K}94mEAx$VozfmPwU3F!do;^r#Zx;4Kz3kb`T$0?7PaX>A5w%iElI59C8vS z(UMpNm2AzXk`=|2lM>NVE(^Jo(h4J9k(!!{mutekj6)YL>B~>VXRavacVG`)a;k}9 zP`vt)@U}d3$S$sF=^q|{_tQ5l zE<@F3uzyDON2X-lQd3W-zY2m*C&(^l<>VEVw3r7+#~mx{ynyhd@o8nX?E_EdoQo^p zT*0y{4HRp8`-$fzNv|PHgEQ#Ch?Mi!Dq4-SJ9K}-d#meMnQ@Yj^7=>nS^ozr0r!7y xKUN Date: Sat, 10 Dec 2022 15:58:09 -0500 Subject: [PATCH 18/18] README and MANUAL updt --- MANUAL_EN.md | 2 +- MANUAL_PL.md | 2 +- README.md | 12 ++++++++++++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/MANUAL_EN.md b/MANUAL_EN.md index f1c9aa3..eb13bf7 100644 --- a/MANUAL_EN.md +++ b/MANUAL_EN.md @@ -67,7 +67,7 @@ The keyboard controls here are simple, cursor keys or joystick: left/right - cha | A800 | 5200 | function | | --- | --- | --- | | [SPACE] | [0] | or joystick button pressed briefly - firing a shot. | -| [TAB] or [SELECT] | [5] | selection of offensive weapons (this option is not available directly with the joystick - you need to select Inventory) | +| [TAB] or [SELECT] | [5] | selection of offensive weapons (this option is not available directly with the joystick - you need to select Inventory). In the main menu it changes the mountain shading, indicated by the hill color change at the bottom of the screen. | | [I] | [9] | or longer holding the joystick button - go to Inventory. It is a screen (actually two) with the same layout as the shopping menu, it also works similarly except that here you don't buy weapons, but choose one of the offensive ones to shoot or activate a defensive weapon. | | [A] or [OPTION] | [7] | go directly to the defensive weapons activation. | [M] | [PAUSE] | disable/enable background music. | diff --git a/MANUAL_PL.md b/MANUAL_PL.md index b47309d..a5fc4db 100644 --- a/MANUAL_PL.md +++ b/MANUAL_PL.md @@ -66,7 +66,7 @@ Tutaj klawiszologia jest prosta, klawisze kursora lub joystick: lewo/prawo - zmi | A800 | 5200 | funkcja | | --- | --- | --- | | [SPACJA] | [0] | lub przycisk joysticka naciśnięte krótko - oddanie strzału | -| [TAB] lub [SELECT] | [5] | wybór broni ofensywnej (ta opcja nie jest dostępna bezpośrednio joystickiem - trzeba wybrać Inventory) | +| [TAB] lub [SELECT] | [5] | wybór broni ofensywnej (ta opcja nie jest dostępna bezpośrednio joystickiem - trzeba wybrać Inventory). W głównym menu zmienia cieniowanie gór, widoczne w kolorze górek na dole ekranu. | | [I] | [9] | lub dłuższe przytrzymanie przycisku joysticka - przejście do Inventory (aktywacji broni). Inventory to ekran (a w zasadzie dwa) bliźniaczo podobny do ekranu zakupów. Zasady poruszania się są identyczne z tym, że tu nie kupujemy broni, ale wybieramy jedną z ofensywnych, którą będziemy strzelać lub aktywujemy broń defensywną. | | [A] lub [OPTION] | [7] | bezpośrednie przejście na ekran Inventory aktywacji broni defensywnych. | | [M] | [PAUSE] | wyłączenie/włączenie muzyki w tle | diff --git a/README.md b/README.md index b9ad3ec..cdfe005 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.21 +2022-12-10 + +We couldn't resist! This is the Senior Executive Director's Cut. +By virtue of byte misering we squeezed in a few new features: +* new selectable tank shapes - change the controller enough times to get a different tank model +* lonely bad pixel after Liquid Dirt fixed +* mountain colors (or shades) possible, switch with [Tab] in the main menu +* active controller number display in the game, store, and inventory screens +* a very special terminator mode for Moron + + ###### Version 1.20 2022-11-23