From 725e70e95502e9393e88211173236169e5516cb7 Mon Sep 17 00:00:00 2001 From: Pecusx Date: Thu, 5 Jun 2025 08:53:20 +0200 Subject: [PATCH] Prepare for sequential display help and hiscore on start screen --- lumber.asm | 14 ++++++++++---- lumber.xex | Bin 34013 -> 34028 bytes 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/lumber.asm b/lumber.asm index 6e6aa59..6ef328a 100644 --- a/lumber.asm +++ b/lumber.asm @@ -1440,8 +1440,9 @@ level_easy mwa #PowerSpeedTableB SpeedTableAdr ; difficulty level easy wait_for_key pause 1 + jsr WaitForKeyRelease StartLoop - jsr GetKey + jsr GetKeyFast cmp #@kbcode._left ; left, Select beq leftkey cmp #@kbcode._right ; right , Option @@ -1455,6 +1456,8 @@ notdirectionskeys cmp #@kbcode._help bne no_help jsr HelpScreen +go_startloop + jsr WaitForKeyRelease jmp StartScreen no_help cmp #@kbcode._space ; space, Start @@ -1540,8 +1543,9 @@ training_mode jsr EnterPlayerName ; enter name only in normal game mode and if there are new score training_mode2 mva #5 NewHiScorePosition ; prevent highlighting of result + jsr WaitForKeyRelease OverLoop - jsr GetKey + jsr GetKeyFast cmp #@kbcode._space ; space, Start beq EndOfOverScreen cmp #@kbcode._tab ; TAB, Joy 1st button @@ -1568,8 +1572,9 @@ EndOfOverScreen lda #@dmactl(narrow|dma) ; narrow screen width, P/M off sta dmactls pause 1 + jsr WaitForKeyRelease HelpLoop - jsr GetKey + jsr GetKeyFast cmp #@kbcode._space ; space, Start beq EndOfHelpScreen cmp #@kbcode._tab ; TAB, Joy 1st button @@ -1689,8 +1694,9 @@ LevelDeath mva #0 TimeCount ; stop time jsr SetRIPscreen RMTsong song_game_over + jsr WaitForKeyRelease @ - jsr GetKey + jsr GetKeyFast cmp #@kbcode._space ; space, Start beq restart cmp #@kbcode._tab ; TAB, 1st joy button diff --git a/lumber.xex b/lumber.xex index e561a324373c07f3b3caa69a78b987fcc39a5e99..3151f28e8c08c92f33a11361bbc43f460cefbf8e 100644 GIT binary patch delta 4237 zcmZ`+3v?4z8qTw6Q%l3s@F+}M1i}Fg>ME#c>p6;GP=v(=6bULwQC!)syDCCLaiA0? zO*-`UbuWZ?a<)^QN>A}y^}yRvr;BQp2R^0-6D7 zq=SY7x5`eWSUSU_A&|z?iI|ik$C7u0BWxyl^oec+&e|xN2r)t<_g%|M=DMrxix29x zy}Ytyr=b^xwEQ-4QLnK1LK*9IyuDRez&SF6Y;Jyruz`21nD8gaXfF-LDTa_qP6+zuYFVG-sjZ=* zu)P1>#*~&i`q@w_u+!uwC(S|=H1ee@?iu!D5mQsjoGccs><&Q-+vw*nu9*02qL1nG zL26+MXV(cC+zg#Cox4jX=(!Y`nT0@^CnV9rEAs_*K%!&wqT%z^Zlm>g76yH?o*Cw0 zg8WkF(rK`YMn%tHk6`3_5fn#Dj~4gCZ@u~R&IJal;HRy$SrdK2b?yoho6+F{<*i^* z=(?hlM*_KSrPY<6%N7ZGwuG@4F`J5^M)53cJsglY=CM4-)a}gd9dw+&9mW{txEo3x zC_h(~AyrvJm2lXuAZGDS!AP5pt<{mAD@F^5Z;#uD(_ogvKS z_GH{@FQm2@BUwbDf92n*nn$77Ku<;kMWa4Wjaf7bY(jxkm%UMa zHsb;c#Rhst4a9GJal-Q0QdX+O;5x6Nc5F{s6pGF8B86fDy`%=BJ^W_p94axG;m_2L z?O`#6Vl&LAP;3uRMFT}wZ4Nd5c;{TP#k~-99azWJ)Q;`)6$-`Hu!2Idft=Am(HfRg zgYI0Zpo7yx58ln+ObY7Zxwf;r=)H5q7c79s$0CT)(x6Fd^t|Prpg`Av=)>p@tt2!mVZ@~o@>(i;P`y3L z(}OG>b%zXcM^p{hAY6${Lk4BG>T{w80Rf&fgYK?4HYYK-xl6-t0hp=f?XQe-^`PUu zNUj@DxcBLfZ1yMDAnbGJT7IHcMG)N8eMsy@(ITutca|~QkD&1zsIDLUZ-Jo;YcMCv z9PRAG2&(KuQbC!|9WcT=K_FNpy<MKPSCK$@a`*tH!m}N16Y{({mZYIUaG+PAl(&yS=OwC4bitQ!}2)mfnnc!1If}R zA6c0$d3@wQ>C$e#Gi&^Pl|J%9TD|2ecz!JY@F;sQ5HGc+rd0b#Yihma`+z}ePfa=C zBkk0pf5>n|)ZBVYw-cVH+oe{Onype~kkSFwrBZWMN*JW{K>eUni&g65 zLCOG>b{EaHQl&nRQgdiBBXCJ7w@&4b54yzxHCmx zGqI4lpRZkaC$pfC+?FQg6_TB4(30W|n58cYiIghIFs4f_{Lt3}+D3l=>%X`ZRDoe% zXJ-iOxrZ}^L)_zZHYWo%tP61+i0ed7DYFa&(vxMNaOTaMXVX?li_1VMEhz)3Gjaim z7f@)7Y!@ut1r%vTVk-)bgs+r0ivb-2Xe)wwqy>pBR2L6O3yPdaa2HqtdU77sTYh$m z=Mi^46BJxaCIsMGGa)K>A(Ij_yTTmCz|jf8K-0-?3<^5ggT;&L1Yt3(PKvO2Nu3m9 zu}z(nVDYj#DaB&DIw`|WSHL7)M5H+bPMZ^|x`?&g^08-#Gk{_smv9j$3(1v7Ng{KWwUIJhgC@vw{S^;Ba z_=X~kWV5Nl6GoAXi0S5Mt{#eRv zB&{rCbEKEc*ez8#K6l+AzkF3Zr(UtfW5dVXU1OAW!E*$sPt#FG^GMlq{2mG3T@At)4S`PpG-|ldo{r{{pat=XQdi^n% zOW<3X-md_iMO-ryn-F&viDwYkgv759cLs@#i2DjDup~+{{m(?J#H)WQI`g07>^IYO+6untpDRaxfUAy@kFcO2)mYGyPq5%7$M~eT z?sk2GWT~npCoy}n4*s6TtPG9ZPRgrJ zl0;Gm<9R6bB)O=L{g@=HV7fYXV1GPteUvM&nMufZ*lz~lDt5s_T*1(rnY3YY6qf^P zB3T;JgoWFPUJZX8JDH{LpO{SKq3un&By)j3xDUy(2y#rjw+JBKGfZ4`$S%NTJ2u_Y_R#j(V??smeZ5O_RNNnV1XLL5P9My2P7F($}1=$(pnX9m&AdP zWRl$s+&uPPSXS1PiA+u+Xi1x?X*D66kYw^G36O-f2Sc!!GqqSz5c=O)NLa0V_T0Vy z|9$`KKK_}#yieD+Pghm3RNH;*{iQD5m|kSnGp3S;eAyJ_*nEcN=PYNm$^3K6Cuzg{ zo6CQ0N-1*myvfAzRm;a~U3~rWsfocNp`Sh2a4>jCju*`x_N#In)6CykUhX=JDtnM} zPuQr~2E#_#5YQ+wVY93Y7z=t3qb+t!eM>xxLX+hO1Pyl?!c__3{tFv;fdf#Q*Z_`@x_jnZw1HOP4dLna|n#J5$!1O5lXE3HZy@ccPwqi z$9io)udK{B^rMiL|M$vA`I=SBsGw7Y$DdIJy()A^1OpY0ZG83-{j$6=W_1qJQpSw+ z2pUEzW3I8xbH!A5Vvi6@6+3g7tU`yv!dDnW73=ppT3O*Hn=9<%&LK+u3^DZ{rpLo9 zE@J-453PB8!b-MK@Ub4p8+(MMoFiS>!7WJ_Ug8~Vr)bCW+twydjA8z>*Kv&vB`b!| z{qk8S^+#RR^ZvCDjlEdRRFpAwC4!C36SS~lUjFm7Q%%=BOxVjT=B>^Nk4{Gb~=??5^t`;U?FM#3ocHgbFdTyz=8;^--TRmsd32n-55_2_B6r${^0YLtqY?9JR30`&S^cB zcSlh+P*rpe&rwyhqty{dksMZ1!2(`*>-s6Hqmz9yLL83x6qTc^ewwPHBQB+?Xh*+Q z9r5|kPgxzE$~qMoS?A4Ej;<+_s-h!2PgT*5UQiv;8h)^I4iy-Q@H;9;*RX=Bq9ZJ! zs^}Vi6LAz-wS`pp>78>$C$}bII=qe>sT^J9CaQ|gVJ%ffJ90)GMRHh01-f%(a9fL< z^x)n8W>BRbE_NEbpLUc#d4ol8Wvqf2IbA|JQ->UT@&#^K{tF5gwKO4RHt_BioA{j@ zlC(`c+VJobAC*yKWd_8$^MnfNaEF0BY9t%y$dPiw>Il=|JTJK&0ep_znCe>1HSCqY z4UduyC5_%Jr(aX;4ruzaeM;=$h5O|HDvVP)>Qi*yEa@Mle!hjo; zyPeEM4x;rT<~YZ+Z~-&3fE(&VVjr|5`Cm?9F6$OByBlOPd~6%stlLA)T*3gGCH$Vv zzJ&mk#byDNO_K+AEu4S6pz&tqSg#HH`@$(0D0ZClYic;$?p7=wYh@p5O0yL7A?wA) zI)i*M!iGKwJ#kgYpv+ZmTKfj|4pzMq)pTBw-7>GmVjY1dZQ7dDp=H4mDI^3ua}SBb6OJ zk1E4R%JzBP0VAvvID$peJKib`X!)*9ce$Yb#VGO6c$1)kr$7^)EEBM33hUr0I;|j# z9LEbl9t_*%uL62`NDQOUeR4{4Oo#$Lj~9qEPEP)LY809#TcCh2QXdeY7&?!{^K^xb z;7<;!YA3&C^GxkWJlQ-4#xt9r%&7MW3}@1&p@|l^B#=R7IdNQx^?`O^)`?)8OAZ_!Kb*YleOFm1L3i)p`CqHt?OV*?` zS-%0x55=$NvmXayrM~1zN4%sjxygDZV2}oqCy8D%KqX431Jwuo;w>v;z@t@ataR}m8|g7=>}FZx}7 z=SwxIQp)~PcdC>HV=@?g;e-oym(;34GgPQx1kwR?R)uD(P}vBi2WUWr7O2pBBai{0 zuT*H63VjfP7Sdowz;3A68WsENh*=Ck=KVCqEh^MB3`rAI^=qp7^s&P)P1lkKC202!Sk?L0v8Z>@n@`tSgelBK`Fm@2jK%*z37J^#te-@86TJ`7tuH(l7y zJ(e!iaSP~dVLI&LS;X}q?hJBDGkrjie(3{-Gk4JFBUW{Xy_DzW?&8I$tl!i{mv<#Lfp9w zU~s(|;DGDP0Iyts1_fqa3UeF=j7|zLz;sfGfk7u8EXwL+FBaR?Ne&h})yY0AcBzwG zES^>;d06aLC;8av3Ya7rku&LV0G*JPjJS5hbt0|{aij*>y|Ng=Bk0K^Lm*1jPhkbRyYS0b^zREk-+% z&8CWib~Gd-<{ZCp`(%r^#MzK%HNaiSgLlPOx6d>;BjuqA!8q&7X1;Q}%~g-2Wj;1b zTH#}}tFyfB#yY?Jjo7UASaYTbJvTj5!|p!XfNChOhVr1p-)2G?!{jAE&QQrGe}cS; zk^}yb0h*9|&mL&w_nOU_Uk=+f{@Cu*Jv1Hu#aDmk3jKf7In<26E$x5I=~8$(rVSQU zA;dKyu@P}0B%VZEBN7`BcM^&9h-*L!EQyjp|8!`TSoNo3Fqf-GP6l55;m!4?@-6Jt z5~rBZVK>MoF|H%TC+vtHbsv_0A--qgV?zJTN$d~i! z)(7TEmyey?aYCz~NS->D^@miQ*2lm1$90JqSDz$)ENI9PENDqN7TlzkzvuOtu5v8T zmoR3VB|m0Q)gHk&j^OHMR<_Rz%~j&79wtX|V|DW)``e^8VtJdgXrm0@plnx26%Om= zrX3shomN|c~>~dwg&Xlr&#%lJtaYQ&9#l{`q2X0>Cn+w(sv4b z%t|bT>cWzY!8fcRvC?%6Nz3{hS1?Vc4H9GJ+AA2U zQm}Lx&$^_Ag^{|j)h1P8Wn8&S>V*J37#6`3Q*y})s~l`624a6jF$Oyv-v^|l*tVg= zwoAdGxgHZ7AS)5(l~=decAdavG-*oHJ7NRkcw$K;mI=gi7pd6OB^rn|NwgAsf-+7V zO>A3Z2^UY`evBo#afS-fNZ~Omyil|N9!IzYijM