From 056bdf36a561a12b0cdf4f35c28c2bfc87218440 Mon Sep 17 00:00:00 2001 From: Randy Thiemann Date: Mon, 23 Oct 2023 20:44:24 +0200 Subject: [PATCH] Fix ready/go --- DMGTRIS.GB | Bin 32768 -> 32768 bytes src/include/globals.asm | 3 ++- src/state_gameplay.asm | 9 +++++---- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/DMGTRIS.GB b/DMGTRIS.GB index 174f0634e0a0b46365f0419b3b9f02ecab3bc6f3..1746492130c9e9b5aaf0c51f4276903394aba9cc 100644 GIT binary patch delta 1943 zcmZuyeQXnD7{9mewQJWF>iD>^0(TwDj)Wl}6Drwm12mg-%{sOi)~@Y3A=6-j#E%gj z*&q^^EaStA$SC|QZ+`Z55 z_j}&wtM9$-?>F@K8;%ap)$2D^uRAuh6)it@X)PKQjmT$s`^97cxy#%=G35&PU9)RG zrBb}9w3fNIpY->V1He9;9B}WU%_9-PiigC1xt*F>3}&~-qqE5)o|^{LD85#)dBKNW z%HdjaSf$4BmX#P>i@^0l1zXY>EeOgjas@vY!XrtwqO=rEi%i`*uBk)#nKY0_;V5|q zztxTpcHyZAew|5>YXU_wLO|SI=jjWm2EJQ0@jWV?9;jE%>38c@OFC1pTGNKjYEin{ zr`pm{pE9WiSeur89v%uSleMf_KoEo{ldkzq+^TcPM&T7ysuw(KSz0iVOai1O|C0n0 z$>8@Ge3sD*PW3WAfhIo)M)G5VTqi$~Ysw!mFB->1PkkjC61UY?)Ih%LD#aEnCsf4J z$}K1WHf6A5nVRJ-f|X<-tzae@MF9sV{)kaBga|f`7eB3Ewjr)1$tZ^)h)J;I+#liU z!}1CR#tc4CXR0@ut>0wpd(_~_B(qYv1G&m^XCO5g%LTLI&l!b~4C8dIXyV4l(6}}b zhJt##LdsSAb%EOI$uG2ZAam;l_Ga!hNh2O;qz0C$C7=axUP<)v<>RSwB zxafmnB=7lpO#aq3jv7WM4G?^`Q&O|+5*P31o*qWDmd{n?=XU8f<5pcP<61XI-S|+& z4hlDk-v*xWLjy82vuL(kOKho?yCtn2bADBR1#O|GnR!c1o=fP`ZIFzq%`M7rIm5j@ zH7E)#i|w!*$w5grodhD*vOptDa!8VCjX01eklZ23W{vnDPZ;E|BwIA%T%Mrhh$I(j z#Eq5(eYv1fNwxwJV~pC|<9n1--DoCj-B04ZNm6pwh zBslUQ>m`9)uv7!c9r|v)K#)76zFe&_)d+f6g0BX)>-B(zr?uv8l4 zs2;u0OF}MKbGx!rdRGjE+M1R4%CA_ba%z;daP;|G3*WYfk zwuQMn!^or^i$nvoe8Fj@LXr4cE3;(2U)z^>C`a^tZZXr!AXdEF zx&!qj18v*rsto~dwS>xZ=dL}#wMfXK+1ML`;r|UI`jcGMMr~v**eibDz7%=IsrE{T zH$-kt2y}EQzYzG+pnH`!#7$+-@-yXUc?F)^@chD@fj}C~#=&6U7c8)W#jC|wa54Uk&Zd z8OiIRqo{9d7`~rMoLkuZQkq-F;X9mYP^R}NGu>bE^gg^JJh2b12D=a-({S<4;Pa6Q zI4XAGAYikO5#U3BO*%FL-VNBIV-w&-fQxk8M+5QA9KsA(1#HzFEP&SnF4l1o;Hf#- z3Rp{E*L54<8*^|m;Fkb9blnd4jfc2ObpUZ62&eAg1iTlpOULuZp!jK_M1$gRWFvY( zycl^IwTVwfgXXqQ!47{#@#reJp)N(Mop4bn8{F`;D8_9v#dbH?r7h>*Xc#mY^?feT~ cjrg*7sjCG2E>3mrGQ!W4YHe|E^0U$z;djJ3c delta 2061 zcmZuyeQXnD7{9l@Yu9coGzi?*vD|G;it;T?ShicIal>_WpF!5H?KZ*1@CTwnCJr}^ z80I3d+&_Ru7c%f8!6sIdsmU_knQSHRAEF5=V|$4L?nFIgC``QiytnJ932E-`_j`WN z`#kUOxsUerSbBOaM-Oouwv=ot?tk-9w5t4v{ zjF-(R<8K`xJzeA#h&II!< z;WBbqXGZWND>0;IKWC*pchP7b;*^W_`F>K5r|Qbo2(N6F*( zU^DJ%$3I2zem+JfB!)~%L3vksLH857#k*5yy?b>o@w!j9C64)Ydt$<;I}%KVo{`w# z*PV&5Uz^f{LI&-=0QZH<1e=6t2{Pq&)rhOUL{0`TXGZr!UYWp27BU$FiT|G@v1Agz z#p7Y#+%BX`OE~hqWF2pXdU;ThO( zYe>6*heDz-;vP$4p+($0;{Lz@TSweyD1ahT67Gr%yv+s`7(o^^V7wmrbN^Bp!#O_; zBR=cj#|G+~MCKS8ut4$IRz*(=x$gS|;$z1UNBg-S42U~T%;)KDfp@P9(b0WhF~nI*Fww6VQR?NI1`Y;#xbSI`zy&E~b2&c$M;bPXiyXnDQ%n*nkgMtfyn z{nBn&jntr`vI9^Eq`cV>E$u8*LyF4Lpv2BY-2!@xskbPq&CrpWg1Qy-u&IX?)o$n( zH3fAR^oXfP6g6X@n>Jun1Jey~kPtN!qKfJ;8>Ap_g(Piow|1%n%_JQM$Y2*aHTrvl zF%Q8*?+5ZaOXm&6<`G!)P-`reQ`TZ?cM5_v54C12Px*rTCpM43n8!3$ zI&UU6kHD6P+A@l#yu?&M)rP}#TUm^0i)T%=t*Dl{J0C+oy|1=%Ua#UXHW8|HD7T%dEc3U*v9k2fzv#q!nW z71_lhGCeMF(PiGn5cdT0o+%EAmy^TZnZjYO2FEoxe&NqRAsQA20SNC(c32?bRUvh| zQX8v+){d8rRnw4t8IDVET*SAUVIvz0(|+1{nqIFs_CdFSU}r&QP-hbEppFu2g1RNq z9Msu_KZt#yE9H9Oy1&PH!9sh8`-+rs0W@Da+A>c|cF#LnQ6$T&PlS<B_(7kM5v$d%Ect)W%Qg1@}e(N*v* z{5HDL1%CgtO}}IBkW4&y|v;j?H(zzS+69>czFS W)`@HK)%KlMxM}hFr(${i8v7rfN60z= diff --git a/src/include/globals.asm b/src/include/globals.asm index 96929f2..f4e1406 100644 --- a/src/include/globals.asm +++ b/src/include/globals.asm @@ -145,7 +145,8 @@ DEF GAME_OVER_R10 EQU 133 DEF GAME_OVER_R12 EQU 153 DEF GAME_OVER_R14 EQU 173 DEF GAME_OVER_OTHER EQU 131 -DEF LEADY_GO_TIME EQU 90 +DEF LEADY_TIME EQU 80 +DEF GO_TIME EQU 40 DEF BUTTON_MODE_NORM EQU 0 DEF BUTTON_MODE_INVR EQU 1 diff --git a/src/state_gameplay.asm b/src/state_gameplay.asm index 79747f0..a8a82fd 100644 --- a/src/state_gameplay.asm +++ b/src/state_gameplay.asm @@ -107,7 +107,7 @@ SwitchToGameplay:: ; Leady mode. ld a, MODE_LEADY ldh [hMode], a - ld a, LEADY_GO_TIME + ld a, LEADY_TIME ldh [hModeCounter], a ; Install the event loop handlers. @@ -152,16 +152,17 @@ GamePlayEventLoopHandler:: ; Draw "READY" and wait a bit. leadyMode: ldh a, [hModeCounter] - cp a, LEADY_GO_TIME + cp a, LEADY_TIME jr nz, :+ call SFXKill ld a, SFX_READY_GO call SFXEnqueue + ldh a, [hModeCounter] : dec a jr nz, :+ ld a, MODE_GO ldh [hMode], a - ld a, LEADY_GO_TIME + ld a, GO_TIME : ldh [hModeCounter], a ld de, sLeady ld hl, wField+(14*10) @@ -476,7 +477,7 @@ gameOverMode: ldh [hHoldSpent], a ld a, MODE_LEADY ldh [hMode], a - ld a, LEADY_GO_TIME + ld a, LEADY_TIME ldh [hModeCounter], a jr drawStaticInfo