From 5901af397d1f7a9d46514f367e3f1fde882d28a4 Mon Sep 17 00:00:00 2001 From: Pecusx Date: Thu, 28 Dec 2023 18:34:01 +0100 Subject: [PATCH] Money calculations opty. --- game.asm | 34 ++++++++++++++++------------------ scorch.xex | Bin 32601 -> 32593 bytes 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/game.asm b/game.asm index 1d19485..4c9964d 100644 --- a/game.asm +++ b/game.asm @@ -123,24 +123,23 @@ CalculateGainsLoop ; if lose is greater than money then zero money lda moneyH,x cmp loseH,x - bcc zeromoney - bne substractlose + bne @+ lda moneyL,x cmp loseL,x - bcc zeromoney +@ bcs substractlose +zeromoney + lda #0 + sta moneyL,x + sta moneyH,x + beq skipzeroing substractlose - sec +; sec ; C is allways set at this point lda moneyL,x sbc loseL,x sta moneyL,x lda moneyH,x sbc loseH,x sta moneyH,x - jmp skipzeroing -zeromoney - lda #0 - sta moneyL,x - sta moneyH,x skipzeroing ; and earned money for summary clc @@ -154,24 +153,23 @@ skipzeroing ; if lose is greater than money then zero money lda EarnedMoneyH,x cmp loseH,x - bcc ezeromoney - bne esubstractlose + bne @+ lda EarnedMoneyL,x cmp loseL,x - bcc ezeromoney +@ bcs esubstractlose +ezeromoney + lda #0 + sta EarnedMoneyL,x + sta EarnedMoneyH,x + beq eskipzeroing esubstractlose - sec +; sec ; C is allways set at this point lda EarnedMoneyL,x sbc loseL,x sta EarnedMoneyL,x lda EarnedMoneyH,x sbc loseH,x sta EarnedMoneyH,x - jmp eskipzeroing -ezeromoney - lda #0 - sta EarnedMoneyL,x - sta EarnedMoneyH,x eskipzeroing dex diff --git a/scorch.xex b/scorch.xex index 2151e818a5b629a69c277e4f1e6831dbc6fd871a..cfb1537998b3f8f547013b1f5bf6ed3a6885d257 100644 GIT binary patch delta 7630 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 delta 7677 zcmZu$3s@6Z_Rl0dBNHMhg!kp4Jk_97kWy>4D(WbpD35?dC0huJsPzT5L1ApHMq_Ug zQBosykfG4x+O3Uiw*K3db?C#XtG4cLUDqm~)a`a`*R|TM{?DDD+iv%RFS(C%&pr3t zbARWNPaja1A5eW-U&?fRr0<|A>E=`~b|oLcuHvKFTApTCqv?g{c?&W%pz}D9o^Sd4 zCg!=kPHw=>(2}3~C@rbbN<5&I(D}N~lkQlWHFd+3sA6U;03}^U@tb&xb#|KEmy2xu zN;IkfdDn2`^h!3(U8k0U(4Sh7z6RwKpv=Wu%EocfjRPMyI0r zvb8x4#alK3tHZPqCxr?~QVXeKB*GTh49&!7%s$fi0fS-=)3EM0#(zZ9Xb;)p3PZaO z(n7QpDMU#+j{xYmJ3aRZ8*uMPiJ}UX?m}N#_|a?&V%Kvfb^{!AyUATbPI+hDfcCpi zyjBxRy@y}cBzwJ>$K1y!G#QqS8+*!wfO=)K3B|4DR?9f68W_0uD?VJ{j0aUB%0^W4*v~zrZ`S zDgM#*e5`G?5(VSmX-_l3YvD#(&^L7`d!yq3H0MMaRLvHLuz z2x4XwT#-MSZ|XdgbpR(>n|L6|N2#Vk+R5^0Xtfd)O?K3+t6 zN|xts|8v2A(`F3;Z6}9|f-|TLyes$#%ZyDwr}?BYNU!F2nUEO^?Ac5FnxFG#W^CeD z{Bp?hiy?LisE-i~;brj(+XN**iWJ;C;)0;H-y2eYJmP}=2Rv<*uLg81EwYMtjXj7) z>3H#|xn8&7k>S@zCC8jAta3IsUlcQYHz|_?g+R%t%f%SPq~2zw6pKWBYt#hI?ZRIF z^T|&eL5~=HkCR4Mjoi8k%sqfV&0aJLkzmJLj~^aAiW+}wNr#e4k-Yj-w1K}#7N&_l za5*V(&9|2%v}&^lH*uTb75UAbYxBOqe2TveSxTki>7jq2ZXA!%J>x@#;bqa`7C?Z4 z3jQmbUdhj~r7QWV*BSXH+j9YYkgX~J1m!jS zLtB>yu_oso`M~71i->Llh;Cv*H+)3Gms%ws1#nDo5C0m)SsVsiZU7(3w!p}EntdH0 zpFP4Cc(y?qReTe>ln-JnIuyG*HM@^$&?n1)$;e(_Bl@83O6D&{w5JknSccA2dbH#V zC%MSnE+jf(URoyjc)kKee{`eJu3{Qi7zK?q3M?pFh!rQ30l^n&8div>fUB17KcS88 zIjXTXpJ3{iLC3$RbGXBuI5XI%WCxkQ;vKPLyf!R@#;;>17`ur8%wLJ!ogiPbT0%fA z+?U|s_Ei37YP;Eevlup$mLD-Ce5tSD3vGJ?_*~m70lZ)I*%^$}LZ=TM*EY4KCxEm-0wr!HS%BxjImj+}69&@g*f!1q2)r>Tqh@O$qTdwlpk zE4~_^Y#}1Ji3qx5_RTkog-W}UU$NINYpvZ#*w8YYPLtyx4L2zB>gqJXH3jpLY|H*! zeuaaf(R+DST}(rzFkTGcQ`r{&u;VCA`e~vsKaDLS&2i8??P*Sc=0moaX~5QmR2^+_ zETr9!B{^o#8lv{vncK%dOc+CDcnlW=A|XrnuxI|W$@3_7y)|g!OlLT8&LZ#oUW!Glo_q9iJH~!dW{|wWLFh-jw;A5-);RXW z-n{B3QUklYHH`LGLI7OKeY|gMrbYX!PSb-8YIv8)D#r#jOb%Y>t_%L67f5y;y8Y1A zdhvd8hr6z;R)I2WY!Q&%M=$38mnGI@G!}PhfHX7 zRj!ljhI?F@JOO-RdvatjppJsAg&VC?i(YW8XI<_1!{k&LcgFX&8}^#3y3P{+sA3*q z|CFf6efhiwFs;KI%`^{a?{|2^u5Ma*rq3JQ!qZa{B4(N)s(|PWP|VCDJ^d8cMClpQk3nr!s9p;QFfG zK268JA1%cdX(4dv4QZKb02h<-2xoP5;S*_3`4@s0FJa$67mxp#7EDnZJaT*Df#*)xkTz7G#r53S#+GrtLnPoM{q7r8Y$^8!^bOGGo`=cxWD5U%Ld;Chf~x;o zudi4ws_vxhlT zF4)a>6Z#HErB6k%YsnLCF79$y1PO*d<=L~%%h8n0=;{{kFdU*EH>79#1QxSP-J|hu z)7MxQtd$U2uok_y7Gg-!P_2^!Ax~HiR**I1$CklLCk1OMYqJy0-wcWdm$sE;R$dTb zZew)e?tjwj-zr`ipywI(aA1b;(~}~p zAzU^o+G{%K0>3yZ0lKeGiiOWJlVafW#-x~(N2?&dF>{CKP~#w!hdk#oHxTV6oDl}_ z_>3nLZ`E;!k|~M23v%*arAABxWlY};s?$|dkP-O7G3H=p7d4L+C|srxJza zk$fjX)PdgS<(*al6Bt@Z1KumxLy+ijhy0c7ArB*mn`R=`JAGU);CmUy(ci(g0E9lU zErgt8R}~YAYoCaw#$nqNy6kW2NUj48y{kd)IbTR2%9|7=P}uoh&c^X1l+$9 zQ4LPTF*92RC*ErY6QLR~H#uG-XMUUu*wP!A^Z3%_SyU&E%FLkjcwy!f)Jbg3O!v=$ zhx!_MsQCTNc4{83$cmxt*pih<*q#lVs)0;}!io#IKG2m7@$N3`Ty`Pi&d2mDvyPI~G{+kJ$`w{CJbc z8{m~wVyP*3_msIo5ykAUxz_}P-J5?q>&9!{?g;$VlteJEpzI|0d@_5S`j16zrB#TVWy`>T_8u4t=|Mf<47!Y^r(-Q^ zS{dtlHwU4$yLJRybId&F;a;;5@>dy%)m^R!mR#45mR#eK#$}DB#?_7M8haWSH!k1$ z_14>47eni_ZCAEk+cu?nM)Tk{Y1==y`8Ux`qnpB-?lt|`L^UsNp3q!t&1sy#!Xs!w z*WUt+;uY6Tk_w`r0qwuAeHu;u3%@ok#J8joZD~X-{_V8z;Pty8XV>r=_9#-c^4@F< za}VE~mY`O&qI)c)@90Au^31c~4-C&F%uuxg@d!f2kAMaLV*9(qJz%fbxHfoCYg&x} zV@FZ{R)Rrs!@$tLRmYW9Kg*UvLSaDt`2A-RBFI=7jFrJyIae+y!2HXEvwbR2L3 zm|@f7m8w=eb$T@=;I8SKhMxpS8%|y$>qWpJ^&0l1YkWzri0YF1)f+3 zJhGV89wdXtBm5lf;5yD66|Wolr##!LtRO%OSu6U$h z_XqIipZuHt^uM7J!qnoLnG2{N@yVHU;nRCoTx!EUP_MVM5|GIV$NG;X9iFZ2 z-*qUqJ8y39KrwjXtSnfyb5^<~B#-IZ{&P$l4K51&(=9+AKsJabI!#rqX+W=HQnnjq zNfnO{={eIK0xU+fuFR4v3Ui%?S(prmm{Hs%yK+3MV^f z?LP`y9k4pp$R8h?6KnCVA=MdaQNkXr3W+-(6=~4(g~{&;iISJ_G-P@3IGo12_mxdY^C z$%45dc}fL@SDI-3pR`vw3>g4~??PB#7}T#~=Z*HN+yRa3d2!*vYoR_xVwbl8LlusS zAh3lNSPIh{=8doFZk4_iGfB=(Dt`*_moboViK;6HNhuIQOPJR259ep9ZJBCWJ4E(} z^Rv{pEH!Zv5rJb^-B?EWXr(?Jv%c!20>~sR;by{Iw9D-JW0M|KrNEB#mALRf>WIsb0Z_C=)j> zm<-A1i3MqzkV59I-P|=%g|h3JP5AZ#oie)~Z=D?jW}2E8p^GIMRUjc^OnUem^fYVE9czUI@&pt9>M#kKvk!j8n1fpj<8r~P5w8ot-2xGyFbZB= z1=-^h6D_v7DrkJUxoOjg%5&g$N12K9R)GA{r zX}~Vb9pd5+4~Nk3K)E&{NK%1DV1F^zHxzbZ;27qf2NAaWaYfGG9 zwoeyf%fVJ#FKr|M;1A)nw_F-ALILKd^%A3cf9n38{kW~Y?P^=XfrqW%wVNE<9X$M9 zfKlT1WZM$Nt86a>p{x1M7{(7*6=zcWu(LQl_G&)-P{Lh+`afVI`~=``qTyEn z#^*H@-iC_XP%HknI4Syv{lGBIRu8yG_?;sBlpcOSinB^kXhs|SLI4s3lDC22Iq*@W z^p97Ugqz?uBB(YweIXl@6KHiyPJsl@S9y3dKiJHv&frU#h zE|HRyXDyM*)W#g&?`ePyr2`Mvg&7Z!<|OD}kVV$yM$A=~TDL2zjY4Em9VgIU~#A#e6V{{?W)wJ`c; zLn_sdeaprMj4EKFfUZ5^qW&-VkRb{$Dbs}9IjG|QjdJvM)_WldZ=lEDzY%rAbec_iXAP0X6*l0w9_(s_ix!)e>5oqomt;(wX z*a&tZfL)wz%{6whHFM|AWz8-{*b(!T=n`ou6Y2Q*psqxkbEL)v^-Z(OikFusFL`V` zuA9ZWHD+OjTs<_)H{=C36pPdjNIvR_WogKbLBGFFlw<<`VS@fT$V+9CNDm4ATX{$* zA=FAxc~<{?PO~&5=}!BjIfy*vl?YZUkZ0WJj2brT3ieIJ(0 zJMQY-f6z&>U_9aOLpt3H=XAPLAL=&e@Qy<|SHba1tDdBMJO{&}tDn;N7C9$^)j2)6 L$?@f@zX|+*>srkm