From 62cfe3c88c9e1c77f3dec9fb5faea84df9f38361 Mon Sep 17 00:00:00 2001 From: Randy Thiemann Date: Sat, 28 Oct 2023 15:20:27 +0200 Subject: [PATCH] Accelerate DAS when grounded. --- bin/DMGTRIS.GBC | Bin 65536 -> 65536 bytes bin/DMGTRIS.pocket | Bin 65536 -> 65536 bytes deploy.bat | 2 +- src/field.asm | 32 ++++++++++++++++++++++++++------ 4 files changed, 27 insertions(+), 7 deletions(-) diff --git a/bin/DMGTRIS.GBC b/bin/DMGTRIS.GBC index 6361c7e805a75100f6cfd412625e49ea45f56799..b2b3407d4172b6c9dbe6c59edc85a01c5ff44b0c 100644 GIT binary patch delta 2464 zcmZvd4{#Gz9>?>NP0}Pyn=qtFO_5C^b_*>jZBo)g*D|O9QB$2e^#IGiyTdZWocGTw zDz+S_qc~)69^=SRwK~|&;GgJJ9jbzyJ4#dXq>Rv>ci#DCU2ylF=0b8JDY%*l1Q9X;ecT;m-c4x#5z1%5^l2N}A@ zg6Dwz?N)4)PTh_smRIfZ~T-W$+8nNo)6! zdg6-8XK0eHkoVA)#2zE}B*^7BX-64)S~k%!xt)%a#Er6rPRN+Hk)4gUJ?!Q~;{R!a4Kbw>^Ugp2fmyXB|I!3l4c!Ua@pT-aRE71_%<=-knzMPJ+ z)3C`7_Bpf`uBvKCEF)crjnTizK{^Iva|2aPLlLit_I-N8tsH`(o*5y=}vCKjkuyFhR z`04^*_qMtzUqS8*NzSE3Gnrxpwu0Q2z|#dUnPLR4g4~svrwdLp#RxnFxhH*e!AM3m zqRtlZ6ylz&l6&cN7n$h*mV(@pzQTf!j9Q2cN55hNn~~e(*iQS^(!NLOfa>m3z+p#@ z+=egLZe1R%WBo(oY&LL6EGM_sZHFq_|0q<^0q>PO^i;C`!=j%Jd?3yu!MgRGmD5Y$ zu92F-m+Edua0Y$7@GEo0&>}c?B1FGbO|Cec2J(1@pVqZMTKBa`6pr3Zp z6YMz6u@QQlW$6fXWwYd1Jn#?Mx^9l-1D)Nms@h}mP&R)=x*9nmG5BAE|M|cHsN>z@ zem>w?*$x9lau}bE&Aq-m7P>1Ji%k2m(Nrc0osK_%=B)T{r8nZRRyYK9?BM6XOEKk0 zOt}zKdSlApV&r7}>`hvv{=Zpr62Bh*4N76LX`?N*SoSDU{AAMt6vb~h#meCG{Z5j- zc1W_yPUS1@i$%3{~Rs zKBsvlyYUSrl}q5GPDUHaD~)9TVzSp1+SI}(rp`EJzEbKh6#g|I+Fs1OKe(x7hxO&Q Gqu&8P_GDN9 delta 2367 zcmZvde@qld6vuDw_V(a@z?}%U$Qk!MET@8icZUbUN^A8%YoVq;QT)|3)F%E>`XknA z53QQCD$$NHwQ7roKpITW1~u4LYr1IzdK0x#=We~tR-Dl^rk;hoIAQx>ab#PbkYopVNGSPW{-`~(v5DOHmvpMsZmo; z2Q9l@ol${i=h+|3>&wy2GlsPej!upRt^JzH3C;eZ+Rnf2=ZxV4Mdao*;gS@Rs)X%Q zHM!;^WkGTwKx$D$x*+JJUZGa%Bd*5;gES~$sggAK*zNSmF8&`@r@eaILs_(!)zze4 z6*;H)gj1|{imyAxYfjP1iBEH4>qN1U6VFYgeM&8FhW>(sWK5@h6+A28D(6_#i0hr> zG8;WYs?Q|V7&4XTQ)AU=((MzmM@QOJ>c z#YQ}nbCvA#2v%sk2@WhHj8Vg$M>O@28&(Qu4cfraVq@nvuFPEV=p|4Ut}5u;Mh`hZ zSzJ&?uP8e27zpXSR(cIAtHm+n*_JoAke(-Z3f)EBj-xTMrpR5}?dZ^)SGye%)ge`0 zaRKh~mPQO7h@CGq=s(NRfvgAJ$wd6x#v!*)3AdKX?sLZy2 z04TeL7OA6}E96B{*`x;HGDy0L9`cJ5`NdH=Ma%2uqzePOhUydf`ly_m=$~}qi=Q~O zM9teOy` zbNO&3kzo&N%28`#)O50t$gl?`<)|g;)pW9s$gl?$<){^Dy_01`{vc+JI0Tt?Ol92nO3k)wzf!Z zYh_!D)b6+)gGe@QJI*_4``7#!63btk%({m9?$Fuz%Jc`({NWhubvtMZz3JI z+CQFqkb%vV(O1>BYw|6!P*hveiw{O$9prO_2+(9en-IF6FcF(<2m7_@C?9n zg=;18Fuw;JZkJ$!4m{b9Z}}&nm$4(@LLGQo;0^Cb0T>#t>hsYoQ}kC4If8ovjmU?~OIEPH8G>ERz^x@yQ3gI+;!lH1_eh8y?D86gbhx9& z%m||?%|XQ7Ct&x+z@`m?se*?aC&bEAgZIC?ySgy+PGODV*EalB@D&hpm%39-e94fp zMJdJeO6RgBnQ0M9@vhPu)PVa-XVt-vX@ZWhrQ}T=xmQM3%^>TFhn7VZhu4(2>d3!k yaOIN2KJtN&glCYQI(Mjy4#xjP?NdaWm2CKP%)NX#^I2!OY`qaz&U789Joz8NTPR%s diff --git a/bin/DMGTRIS.pocket b/bin/DMGTRIS.pocket index 7a16fd1fcd31af017ce216893cc38e389aa19642..a96f92c74f95dac413b81da9d4fc33791022430b 100644 GIT binary patch delta 2464 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 diff --git a/deploy.bat b/deploy.bat index e549f28..9d3963c 100644 --- a/deploy.bat +++ b/deploy.bat @@ -22,5 +22,5 @@ make > NUL echo Pushing new version... git add . > NUL -git commit -am "Deploy new build." > NUL +git commit -am %* > NUL git push diff --git a/src/field.asm b/src/field.asm index 4e17cc6..db30d20 100644 --- a/src/field.asm +++ b/src/field.asm @@ -1159,32 +1159,52 @@ FieldProcess:: ; HANDLE MOVEMENT ; Do we want to move left? .norot - ldh a, [hLeftState] + ldh a, [hLeftState] ; Check if held for 1 frame. If so we move. cp a, 1 - jr z, :+ + jr z, .doleft + cp a, 0 ; We never want to move if the button wasn't held. + jr z, .wantright ld b, a + ldh a, [hGrounded] ; If we're grounded, assume some urgency in getting DAS charged, charge at twice the rate. + cp a, $FF + jr nz, .checkdasleft + inc b + ld a, b + ldh [hLeftState], a +.checkdasleft ldh a, [hCurrentDAS] ld c, a ld a, b cp a, c jr c, .wantright -: ldh a, [hWantX] +.doleft + ldh a, [hWantX] dec a ldh [hWantX], a jr .trymove ; Do we want to move right? .wantright - ldh a, [hRightState] + ldh a, [hRightState] ; Check if held for 1 frame. If so we move. cp a, 1 - jr z, :+ + jr z, .doright + cp a, 0 ; We never want to move if the button wasn't held. + jr z, .donemanipulating ld b, a + ldh a, [hGrounded] ; If we're grounded, assume some urgency in getting DAS charged, charge at twice the rate. + cp a, $FF + jr nz, .checkdasright + inc b + ld a, b + ldh [hRightState], a +.checkdasright ldh a, [hCurrentDAS] ld c, a ld a, b cp a, c jr c, .donemanipulating -: ldh a, [hWantX] +.doright + ldh a, [hWantX] inc a ldh [hWantX], a