From cf6b75fe9e452bc8c7a9c35a01273eb9d759f41f Mon Sep 17 00:00:00 2001 From: blondie7575 Date: Sat, 28 Jul 2018 17:33:56 -0700 Subject: [PATCH] Improved turn switching behavior --- gamemanager.s | 15 +++++++++++++-- gscats.2mg | Bin 819264 -> 819264 bytes 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/gamemanager.s b/gamemanager.s index b98675e..4f40da5 100644 --- a/gamemanager.s +++ b/gamemanager.s @@ -186,7 +186,7 @@ trackActiveShot: lda SCRATCHL sec - sbc #140 ; Check for moving close to right edge + sbc #150 ; Check for moving close to right edge cmp leftScreenEdge bmi trackActiveShotDone @@ -201,7 +201,7 @@ trackActiveShotNeg: lda SCRATCHL clc - adc #140 ; Check for moving close to left edge + adc #150 ; Check for moving close to left edge cmp rightScreenEdge bpl trackActiveShotDone stz mapScrollRequested ; Move screen left to see shot land @@ -224,10 +224,21 @@ endTurn: endTurnRefresh: ldy currentPlayer + beq endTurnFocusPlayer0 + + lda #VISIBLETERRAINWINDOW + sta mapScrollRequested + +endTurnHeader: jsr renderPlayerHeader + jsr renderInventory stz turnRequested rts +endTurnFocusPlayer0: + stz mapScrollRequested + bra endTurnHeader + endTurnWrap: stz currentPlayer bra endTurnRefresh diff --git a/gscats.2mg b/gscats.2mg index bebb733e527d6c16794b293c7877976e86c4b16e..b1f000c427759f74529e98a3a6f724d32aeb3931 100644 GIT binary patch delta 1430 zcmYjRZ%kWN6uz~>HdoWhvQ7K^+k-mi+s*52nW(k=wTC*9xnHb|{h*1*3C*p#}49|TJx8CIR{_gLc z^E>z4b8lBO9jlp+N}Jo?b^xJu+kyO1_o0rOwTvEq>iLtWPIRAs_SA7jK?r%S zp(y$^iG;TZvq3)PKC~}muiq)TS4wW_v$?}MA=(9I=6u=+GlzW<8b;bVX8Qfw7&8NY z?L5QpucQ{FW=SgPlOIcC2lM0~67Tsw)|owH>^<2MH5$7%OL}xs>Xu3?sYR*vgfzc0 zy&-iTY5z(B!+0=+e+}XVf*WK*LfRzZvm`8MT=?|_A0~#l+b``%d$aP|Q ziaNo;B%cw2KP31B2&C~R37!Mcr=Y%_SNIm~6(ifkx2Y20B~tB2)`JU8(Tyqe<&e^3 z^doJU0B;2snj&-xU7sgmS8!4n^n;(&h;qhOxH?iST;?Q34G>6(TB6ijyP`@|W;OjWB_F zade;f_J2ZyT;s5Z$+L1P;Z*QvGl<2nDq`cmJnG>6U0hWJ01*I?(*eMMio-Ynm~oo{ zK&X(KBhLVy6Xa4sPf2o%tdq+(esf9s2eRCm9$^JW`8iflDIZ}z7=>@&tO?ghs_H&hLxqbs4$gur8+J6li@5SALDnj?HwST=TqqR-&Zf>@{^`Bkx{pmSX zDE)=Mv*%5NQK+~00_ft~gQ6D`L^NWS#HYpKh*1Ut4pTfbk^5dJrgz{bLW;*2qIhbc z_8i_+`7K(uqsz9dxXevZsN$hfMVVxDE0`^1;}>M~LqGQSH}&irVe zVfftvsJaId!qLvEe3!xt+NA&urhio@x25kSxf1e6|7OhcD0QP`aXMP)tV zmV>7&$(SLd2tFn+RgzB4u=!NXW@>fJWB%)v+;B8F0eWU9w?6h delta 1417 zcmYjQZ)jUp6u?h{DD|24q%TJG_2r0A<>>6l}_UwtMc5zh*jUUm&ryJgl-|TqAduAjtkQ( zv%5m)f%>P2;j<9JUkTQ$*_(HT-ee_)4@o%Ih<6(B48e7xB_Puv%p{Vid+>WhY?R0z zyfMVilClQ}2|Lf%R>G2eZ6j0C>K2RTjk8HExHiPbKp=^~7-Ay;`efAi=UZ%(_VUkYX4_N_vkWQqqw=Hk&5_-U=<8v* z+3H8;C;`6QFy9=e7txJrB6;$oB+AmHr6i(q$V`)^G{N76@?#{LPZRxj-qHw(;wKvM z)sS15nIQpVI80A{jLc~Q&0CcU2;&bzykr`Js(I7|$r~gJa*Oy%{l4nied7E7iSv*q z2{~uR#knE3;y+qIEP7q$h5r1si}$OzE^`1P03fFefB_YkaRD$%hXL>!Xt0U^jHzi1l$ zY>=9%ehVH%+WDRAUrUp+A9sgJ2tBZV?Auilt?z+%ON-;3z2gxdPEN(S(jEMbv+h|6 zg?{rdgD(Cx#%D1`_#jLYo#ltazakKDnEX-k+)Zvw@4yy9vd=n0@uh+4a~O`Z+qCFJ z7adoAd7Gh8IZ#?Yf#gT*GpdeD%M~eXzp3gE@_%Ye%Sf)%f8(sEZ`x6K)&tOW4_HmY zm5|}L?}gigY7tL0xUZf!2{-$G6zC~hwFnegA-mxf6B$`bb@@av Z4_FPD7t9A%3+4x_0}Fr!7rK1)+J80i9ew}+