From 15f66500b89ee7ac7bd9948c386222ce72a51894 Mon Sep 17 00:00:00 2001 From: Pecusx Date: Wed, 31 May 2023 09:08:35 +0200 Subject: [PATCH] Second button in Joy B2+ works --- Atari/interrupts.asm | 4 ++-- constants.asm | 2 +- definitions.asm | 2 +- scorch.asm | 24 ++++++++++++++---------- scorch.bin | Bin 32768 -> 32768 bytes scorch.xex | Bin 56626 -> 56623 bytes scorchC64.prg | Bin 39530 -> 39787 bytes weapons.asm | 9 +++++---- 8 files changed, 23 insertions(+), 18 deletions(-) diff --git a/Atari/interrupts.asm b/Atari/interrupts.asm index ec7b769..8ef8e6a 100644 --- a/Atari/interrupts.asm +++ b/Atari/interrupts.asm @@ -183,8 +183,8 @@ EndOfCreditsVBI tax lda PADDL0,x sta PADDL0 - lda PADDL1,x - sta PADDL1 +; lda PADDL1,x +; sta PADDL1 jmp XITVBV .ELIF TARGET = 5200 lda SkStatSimulator diff --git a/constants.asm b/constants.asm index a328fb4..4aef9f0 100644 --- a/constants.asm +++ b/constants.asm @@ -364,7 +364,7 @@ WeaponUnits .by 1 ;Ton_of_Dirt ;_26 .by 4 ;Liquid_Dirt ;_27 .by 2 ;Dirt_Charge ;_28 - .by 10 ;Punch ;_29 + .by 2 ;Punch ;_29 .by 1 ;Buy_me ;_30 .by 5 ;Laser ;_31 .by 1 ;White_Flag ;_32 diff --git a/definitions.asm b/definitions.asm index 22a2ba9..de27703 100644 --- a/definitions.asm +++ b/definitions.asm @@ -70,7 +70,7 @@ price_Dirt_Ball = 130 ;_25 price_Ton_of_Dirt = 171 ;_26 price_Liquid_Dirt = 330 ;_27 price_Dirt_Charge = 343 ;_28 -price_Punch = 158 ;_29 +price_Punch = 208 ;_29 price_Buy_me = 170 ;_30 price_Laser = 277 ;_31 price_White_Flag = $0 ;_32 diff --git a/scorch.asm b/scorch.asm index 7081e41..c404479 100644 --- a/scorch.asm +++ b/scorch.asm @@ -35,8 +35,9 @@ icl 'definitions.asm' ;--------------------------------------------------- -FirstZpageVariable = $57 +FirstZpageVariable = $56 .zpvar DliColorBack .byte = FirstZpageVariable + .zpvar PaddleState .byte ; old state 2nd button for 2 buttons joysticks .zpvar GradientNr .byte .zpvar GradientColors .word .zpvar WindChangeInRound .byte ; wind change after each turn (not round only) flag - (0 - round only, >0 - each turn) @@ -420,9 +421,8 @@ notpressedJoyGetKey lda STRIG0 beq JoyButton .IF TARGET = 800 ; Second joy button , Select and Option key only on A800 - lda PADDL0 - cmp #$e4 - bne SecondButton + jsr Check2button + bcc SecondButton bne checkSelectKey checkSelectKey lda CONSOL @@ -446,6 +446,14 @@ getkeyend sty ATRACT ; reset atract mode mvy #sfx_keyclick sfx_effect rts + .IF TARGET = 800 ; Second joy button only on A800 +Check2button + lda PADDL0 + and #$c0 + cmp PaddleState + sta PaddleState + rts + .ENDIF .endp ;-------------------------------------------------- @@ -472,12 +480,8 @@ StillWait beq StillWait .IF TARGET = 800 ; second joy button - lda PADDL0 - cmp #$e4 - bne StillWait -; lda PADDL1 -; cmp #$e4 -; bne StillWait +; jsr GetKey.Check2button +; bcs StillWait lda SKSTAT cmp #$ff bne StillWait diff --git a/scorch.bin b/scorch.bin index 56803898c2a5d7904564bb3dbcfac8ee95ebbe7f..b5193bbd6698732778cda2d1dce122b1ef31d48a 100644 GIT binary patch delta 1537 zcmZuxZA?>F80Pc?N`V#-vcmW{Fg7WmsL{a;Sf<;=a;1Q!e1vKpZVPmP_z^Re3|TJI zwrKT5+CobJy^QN*l-*6zjN)9jCRhJ7Zgs}R&9Q_CZm!#O)6D2jG0`70H#yHa@B6&Z zd+u}3J)NC`&Q5_lA`0m^Nt9lIK7hAlR-wPa5wp3d0r2)ds=6G<^|E2E6Y{Jpu^z+i zNIAY_!z$yC1#+)N&Zh&^1QSgxn9poB|HlT&74uF3XIkB+w+@HD7YT(rqT`pQ@tJ%Nkhp(+m*L2ii#nczT47E-}b zNh%tLnUc?tirf9F0+Enq{UI{SHe4d(wGAtiR5t3yhin|}V$E{ERVqe`c{85S5(7q!Ov;#26wI(I1%4sb2yL6z z8?Hju)>t9702_|~(z0Rn70P4gyGVYgi9bx>V-rsk=rSu+ydYT3OUUAoi5C$_F!SLA zzA^D(1kRgzF@Z)iA46c+%*zN&LY!J5P7bA^KwXK{a76t8%|UlrTH>57_={h`KH8ie z-IE=?*q`!%r>vj2qosP$EtscnqBr64=56R(SXKTO`Wfuy%c8zI%FL1vIlQ0h0e^Y5 zVzrfQdp4^tR!Chx#>|jj*N=tfP^?)hnLWn87z{1m)vQKd7}it~zwc-^A{P`@EF)uc zMHiZe-zwDTeJHH#K#g#&G8-+xPn8NZ1@|h~iWaQY0=!(cO|W2vjE!mVdDYeQG&}Ba zP=3d#@u*Ke64q_(-ukOg9?bL>$b+fa4`;XJuJMD{P(#b81S6YAyRg7MYRuBFkm7s& z_#v=iK?(LO&N}Hn@&bB;#V5z>AX=M=Xvo*Djaos@Ha&)q?8Y?g(dNWW+eVG#47j|- zaz4Qyjt5{uo147jBz2~jNm9yrc`#zkBW<9*?q!mL2dFb}N2^51kXF4WrQ#$jBnN23 zRhxj7?c^81W-V^%qa3|NrLFonIt)m+<@uF;ETUQ5zMC{=v0BRv^YK9;p0?o@Xw#*N zR5rE@thz+h1f#kkV%x?VkbH0J8I&9F9L&~aigWCx9wkK9Dzh~9o%S$?&+)sXxZm7g zXdjo};zic`yv%)9`Ebnhn5e7GM0xODZ2>WSvbH8FXAr;Rz;*}m2$s|>LpAVfU1~zk zVDqm1U8WQLBk{?ZxvSQ$SK|)YRkuw-xPAu};Q)7CM*QM}4I`#58aaS-Ai6$3y=0IN zcZwJD%taiE!Q^bIR2!XHL8J$Z-iw)jtrebK-NbsUa=hov2^} zO=5n?t)ThY=?nPw24kstNNG@tS_c+u^WxSy7i;Oj z+*9__xC72Y<`mI5srRO{)bNk9-DP)OAkQ80 zTsWamLfMe4Z_AE%u_Ah3$Z$jqm%H!cc$aUV|2DY+Lct6Y%n1cyQokhSNy@uKu6|tg zlyF1;TtSEs8>;<3;l4AJB5|oy`nWWVXk(&%-^nfCdN~SiG(~>e{D}}*V4|g0a*(C} sWbP$(Kv`>2gq3v-CVLpp*t#9bbUlhM$4AcRNpGzXFgos9+e@+k0iHRHy8r+H delta 1600 zcmZux4NOy46z=U0)B=44F)3B>g7{MbQIVib2I`bj9w1l-IKbjx0`(6Zb7D*w*<+3( zpa*CRJi^~Yo*BY?YQkobn9%vqO|pm)w=B*XvW-P5%*18>>_Utti@C}D&OPV5=bU`^ zyjNZ>Eiae$dwQWPLFttzMb)t1XDxaK4xf~b`v4a;(wV7PSIvsCC^&4BswJPO~j z;dsk0F_g2K5`)}+VxU`%f3lJ=GIN9OC8IL@sSu)ec#@=77xYU}D;(5DB9*{u^E}Zb z;orr)6io?S2(KiN7SMb|Pet*lF0E3Nw@CEP7u>4}CZ&W#F#gTLdA@qY*q#kM{ z1r%+2@rE=r@r`c9i1hqqo0;SiG7Ji&ownjW6A_@>!Y%62%iY0ty>wJYAArM2o6WyM zXud{<8-Vw~GbUcb+@-Hu#R?KXUL~F)aH&dU2w1K9cv0%k7nS5tRVB&^1X@K80zXuV z5&}1@qJqEytLQ`Eyj4^a_y&B9TD7nE$UPh3bi{Q7RvFXL4k$N1M^kVzIcUL@&HdY` zmVcG9!u#|J@3}_k>(HOvL}W^)>(Srvfc_m>Kup<%eg=K&KJ+Klrbc+(tl=J#7i}-2 z8{xauOl@2p>HlG9qeezg)N+HQ)*+Z%f;vtwykCo5V z(K8T{u}eBr2f>L!@KwgW#mnuu(m{_qx-B&>szXv~sm%Y&MY%(qF_b$Hk3;8DZY93nG;5VJjig$hx!OhHM39+6Pz@|I#d>WZ zB&G*{c@)=x#kA6Q*w$?!^T9gfDA9k^19w5UDNJ{;ffnky06isAZqJ?pRWAK~J*RV@ zpaqyT>CqBckQu!wr-7G|;p$+s{jt87d_LG}!k;wK9rYy3{>(Gz3_Q!+krCU-BZkMt zM@eBG8%k{yDg;YfB2nt`6|EU&0me8hp<9Yjh{$qPQ;hV+tq1g`Lmki7ogVB;*Fct&h~c zmz&pfV}B@^G1nNcU`k2kWNwhEZk}t*RqEEz(=b0*FF)2icO%?4u|>;`6%zKuTlR9_ z&s)}Wog_zRztq*`8lzXj<=o)+pqf05>io!vbGpUge9~etOV~2DogE?T1z97kxrZq+ z8jVb`T~CJOMOIhwhRfOR-Sisp%{#ntAxoa|*sS!3NKf@Y#S2;2vC+rmxo4fh#JTdd zllOQ_44n1B)jVCmEM4>1IiFJfKRT7CTO@rGRlSZ&NJdO^%{>dKgycg3o(`UE)eT$_EQbn^I_tD{sJG)l*Px# diff --git a/scorch.xex b/scorch.xex index 7155ef7bff5914ae1f1c56069848f656067a312e..6a1331a19650d97983e478d7fed116ea4f01bc20 100644 GIT binary patch delta 7343 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 delta 7468 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 diff --git a/scorchC64.prg b/scorchC64.prg index 441796b42a4c39f856dd37fabb857217f4892dc0..1098993c16b473351bb667b145d6ffc2da730560 100644 GIT binary patch delta 5360 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 diff --git a/weapons.asm b/weapons.asm index ddbbcfb..8e62159 100644 --- a/weapons.asm +++ b/weapons.asm @@ -1329,10 +1329,11 @@ checkJoy lda joyToKeyTable,y jmp jumpFromStick notpressedJoy - ;second fire - lda PADDL0 - cmp #$e4 - jne pressedTAB + .IF TARGET = 800 + ;second fire only Atari 800 + jsr GetKey.Check2button + jcc pressedTAB + .ENDIF ;fire lda STRIG0 jeq pressedSpace