From 7ce42296c8559d6b2949351be29a8ff1044bd415 Mon Sep 17 00:00:00 2001
From: Randy Thiemann <randy.thiemann@student.pxl.be>
Date: Sun, 29 Oct 2023 11:45:02 +0100
Subject: [PATCH] Let's not speed up DAS at 20G.

---
 bin/DMGTRIS.GBC    | Bin 131072 -> 131072 bytes
 bin/DMGTRIS.pocket | Bin 131072 -> 131072 bytes
 src/field.asm      |  12 ++++++++++++
 3 files changed, 12 insertions(+)

diff --git a/bin/DMGTRIS.GBC b/bin/DMGTRIS.GBC
index f9f6caedcac556fdb82c194bbcc5c33b51e114f1..3750d65d8d74a6999bc0c0cd3851809aa39e55cc 100644
GIT binary patch
delta 1765
zcmbVMYfM{Z80I}aEl?;>WV5icp3Xsm?B>jvo8zQF0&Qu=C>Nt~l(Iyo$@a%Yi9;zk
zfdLzu4L&w5fz4a|1BS%9ktp~@g_SR`P0E(c<dB#VFv3Y@G$C62P7jxZ{pYXe>GwX*
zdv4EDuQ$r;jT$})3^I+Jg5fw_Tebf4YJ<kS;MS|EuIdt|x1WqGCiqplwJLK4f#)Jf
ztWm#bWISoNI$q1=tg-{a{ap5{dLRf_my>g2v`eZ1e*Y3Xz{AM#6qYgNyH;?*E{$fI
z{8|=b>S^-n=2^i9r;WbTM#$V7(@_=up5Uz$8q6l&$5vQiARn17Lbh)xAD(B97=sZR
zrb2Nbn3Q1<n}TZ`%hn1{#Gc~X+b>3nZ8<`l!6GgMAwv=#k%b4)P!kwYS^>Nc7g2iw
zyvZ~aqW)&Mg?b9%7_6e%LO9Iy*w9xk(7U779%S#f+i|~Ly#6CATqiawnL&4KkgD%?
z;y-LWyYysA>=mxyc02m$611tt$lvH~JG=#>Xvq%7mqzWeJbQb>{Dof=lcf%>Ww1e(
z`*Y|UPOD+a#_&e?P(?;jt^<s8Po)eOWay@_xwS0Z7`3^zAbc22x30*0Vv9n{Gbu2m
zc66^5l35+~qGifdaa8D)6@4<?p<vp$;fcFpPm?Hl>)WXJ8S2$LL)#C?P$a`y3flD*
zlVS%NbArM5nG*)pOr{4dU4x^@>w=W@A(t4?L=;CaV&cMoxo~1BPA|m+rFgs)tIF^z
zmDo~-o6wjGQeXbgZQeHtS}BCs;uhy}I5n>k0z<-_esbH0j}`(X%}T$ZNQ4=3Y$uiT
zYr-R5E!^W(!u=uPfiNrnMx&x8#cnj)37*)PJo>>Rd4mwZ7BpB2>0m(<rC`i1cJr}9
zK>RQm!LfXzG<J(iLEz%ZA*&b=9`d_FXXKVmyb{vTi(`u~r3^~6(Nwz_gzqhGWEh0B
z`V&_1p%5^<tAF4&PfS2ks85tXR&Y_l*~u-9LBZ*3*z{TzyiCE*DtMjDeFir?=DzmA
zK8ShY%tqm`?`VTmxJ4f=T+RRM+KSY*MkdRKE*HRSsG}Kl^!@cU!!K|XU1))1X1)Y1
z7eX?v^>7RH?c^M^ZP^ZNbF8;**-GjhXw(MAggs8&Yu~C{HtM(pm)ZFe(uBBH*ek8N
zVTa?$+X_3F8VAx9K{5xV#v#|w7~Tbj)S#JG8q*r|I|a$qKuxTgnoz&QG!h%7OchDB
zp0<$oeHnTvNS1?6DvXhYPRh90%_}yBS42l@eDUq@D2o2uEM5aw`l<4bpr0?t-Q{?s
z9RE~~b1QIl1^%Q0|5Jr0DsUF^bV6#ynQC+6)OyhUo^3%tw`~*(`XMV>-VD0m6AHR2
zJm^o+&z*1%{3x%BhTD(c=mO)3r=I_Wn_f;1cVH{reh(?KE5c2Gcjl3K-*^|C)J9Q<
z6mdU#b`TEMzf*1AJ+&TA$`31efr7uP;O7;bKDHce>g`hSFBSY-1;4+}4G|(CbMd0@
J2YM5g{{pO`z&Zc`

delta 1808
zcmb7@ZA?>F7{__q+d?S_MaBv(&}O1YSWuG*;<y$umR97YK$nd{Da&5s2C^(m2yvm}
zCa*dj&@%#CFnn<Or6y!nqpspvHbhPsm=?@rxh$IuOz<wtG;vAUX)iCA_0v8*zn<s$
zKey-J|KH(=a5y5a6ocgJtdUZ<vL(8uPBl=cmg|4Esh-(-qGKmFpNuTV-jhcERjW@Y
z@KP9w(y9_hM&natF$!JYb7sh&qucvjHsnw1Sx(GXDwd=}Y|auh#HNkpCNYxKY|9fI
ztC7nm$!tZCWRs+S{VexXwbos&g`L}!r)m|SaE=q)N&Qy$c>^p+ARDEA3VYqI0@y9t
zncxpgPc-tU{VO_#Y2qI710_w@bHe$qJg!Tv=NJ5t9vI0oq8q0{i*_G|cO*?lbf691
zj2SjmRFhc)xt8x=8UNUbF1Nujx@d%bu#D!7ut)NFA-dHLg9#s){LHw+gugKH{XZ~V
zKPfbj?@j1<2WVB@Mfi_GmRWi<!4Gn0vBQK0JD^K?oA9XB1Rw2pnW9+c`k4OeJ-ISN
z=3hx?{EY6Y>zXc74rHzQO=wd>TxgdWwBSNVg>sCR^>vM*3i<lFy3l4gT{kN1`9&!I
z2t|Dav=WyI-R^`$CW@{=bCjgfbpAMP(Z_cS<<jb4Sr;8t1qK@^N#lsiSrnX07D_HH
zscRQIHy(29gn)D<AbpXz+~<qnj!cqlM^Ag{hwZjN(vD#Z?~{j>C>HUk1wXc6c{xrh
z$GzqF+j9J@93QR0nhM-pgBtokn?7RGXWoU#fd8<@#?R#GWUQR?xwskCEpZE}%3-Tk
zV`Epi2ds>nVx`=)i@VQx`Nz~AGE!he^L=2CRvx6ED4bPuKDrK-I3elnT?XFA&9a){
z5veJl3ec%}FCB~%t)eT~D9*=!<`2^`Y+P`fU!tR1$mR{GkUtxoQ3xBK<m<=A+*3|4
zM@G;qEc)S&2DQ{cR?Ckz+JX3BxF|mqF)w1~?#7H-#Pr3iYYif<5b=8=KC#N`FrJW^
z7~cJ|4eslDhO|*v9gqpi9dE5g(e2JY8HnPXn?~{7|Cz#8NI`5H90Luy)CO}JXCXgr
z<flk=K8@pt`Fxx4cklcZebLy9F0?}u^~KG0`09mtGfiQJ8NX^?P2sYEG@^zMNRCY?
z!skpIA<RGn9dL&6mXT(Z*$Lagi^@8oG^NTcWHBQ&A3&;*r<3})3O%GnQe{SsN2t*m
zLg@@8os5zo|1H$iaw;$F3d-wg3CN*{$`t{5N`N8*w4ahxNoVJUS%0v&HQn$a0ucJU
z7cAQkRj%2;t`c`w;)|8|MkRj5img`sr4|2Ki*H(S3aameWb12n`qqh6_j~M{+;891
zVyV}t4au^BC)`hDUjp{ngHe!%MqvSQeNYb`RP2Q9uY2r-Ikd_08xpc$|BvPApAanX
z+XxNaaKI$8JpJ8wka*q13B{2Lst7pVV@Hk}NNf4kz|V3%b+hXII(^E-s(&f(5%FOW
hzaioV5!2Tqc%N#WBEBr*??gN;uzTzR<kSQ#|1at?;Zgtq

diff --git a/bin/DMGTRIS.pocket b/bin/DMGTRIS.pocket
index e7bf1238aedb30d1e3f4f235d97e00397e1a4c05..c6db0cee10d5784e6af227ebed581af308f74774 100644
GIT binary patch
delta 1765
zcmbVMZA?>V80~X=TcNZ-8M>lXZk<vfe$7RkPHze%(3VED1(q$7QcQ+hqJNfbX1ZCN
zL!~HN1YQs{Mfa8c!G&a<HrZfrwiW9eP)E_kC6{E8z%sar%a)k!viJ4^Ue<s6bxz;s
zoacU>(_k<y7)-mq515Xg!ToSO(-dknf8J=(+ot?xZNo)V_UQ7H!RhR{)->N>D<tro
zh8V5p^@GE?>vUNLZtoK|EN$jWp6J4o=HhH#X@+4&8|F99uwh;^xO+9r<d=KraP}I#
zew6%LlVrM4^6Ao9#Rmtik%Lw!+K|!Skp7+!JRvmO@*^KRV2Xiqlz$pZA_L{{JhQ_p
zX$tcz#juoHXc1ead5&d|36I3y>SH%vTp@<`3L%SKoRXkW7Vc1lThKrYSkcA`cpXlo
zwhDNYX|6<9&cHR)TM4`12^z12?M$x|eRUT4RvvRn?5#EzzTy&leq@Cn;&hNPbkhlI
z&D|dShm&V#9^DrEgbTRMg+4k5A?*<P8@=s<w;+mUTwr}E>N4`|jhO9=xIUv;C(ReK
z63hKL@C|3sGh}giDRrnNQB>*%E8SDCz;Ok-DJ*TRNj0V|ZLLThrqiu+${u4?a(NL2
zCh9_WS|N`$Q7@XMOq)rCK}B&{ftwWa7jHOrE9Gf&Wberk^*%$rW>0ea76qylI84E?
zuwq1PM?)U4L_YICzm6#ipqUQXiGp5OT`=Gk6M9W``ZOk9{FfK!_;7&_hkbb1hqX2M
zm3nNi!7XUW3u|Bg&Trc^0tPvR*zOl6_HsI2FC+$p3G>LZ5uYw3$VLbKf+7*d$gWjX
z&d&=Ec%5*E*9vzBgnPoc_#2Iij#T^6cqasm8D;c?t>7&}0^3o)4+_AJVm`2zRQq|O
zkPttVG#tz4$YZ}aBLSC5wmHOvaGzh3JR{ef;)SG!UL4yat83tZA)RWcCHUU%N0xrr
zcyf<Jye}jy@0#!VZLt{SCi_JBLlqZQoE>?pv8XtG4NG2!ir1+4VHH22@QB3^54o>{
zun96=IJ8(e9NF0{7j8O23)l4jx;7_w?G#h&MCU8uHPn6vO!WO-J_EnNRdoC;<S~;6
z&}=2-(OO?W3zt`MZrZjIH+H%g+BWMTC)_CN1Z(zs5AJh4ty>9dKL_X8$pfSXajmdH
zUUkU@yHT(eRx(X)WU7KZ4oH(*sh>5q3k+#OW34o%P3U(DvZ<MxSRFN?D>Bo|EJ~Sn
z1=R*ZN$vXz^iq&5TRl{mAqzc}amJ-9o=UBVi8MvB+TcMN{kNI!0B^zm+QpzBt;OB7
zc(4}#REtaNaAO_*qz?bnfMa#I7zH|EZQY?p+o{_NL5~NP1^vjfQ8MV;9AtJW=<z@@
z=-SkvKSn=y!V!q0vMw6#IC`TCta}~@{u6F`IVIeQr{RtVNR>+!Zu+~kj7&y`yI`Lo
zjXLCr$I-L>u=V6Sjka~S7s5&Tb``Hs@mE#+sEX6aR)S5vT`K;iihrx(cNe%tBN8%^
LB}RUrH&OpD&lkY2

delta 1808
zcmb7@YfMvT7{__q(?YojMaBv(r43Gzuy{!(h~rqqSXz-wfi4?^QkGrf2C^(m2yvm}
zCRc9*`i{U73?G<&sR^0YsH^xc8zOHQm=?@rIV_tDOz<qrG;vAU+a4~5_0v8*zrN4&
ze@@?X{(pxf!r_RxS_G2*;gJ%!x+SK$R@q;xlIwrADWBWAW8x+^pNuTV-IvDvRijTQ
zkQPRwHOj=1(FCn5R-wy%!3_Gdb^Bh(2K{N>%Sm}riY4hFo4v#gvS}kZ$&4g5%kmV*
zspaxXGFu)b*(B*(Kg&5?rEynjVCS}|(>03EILArulzyxGq5&2pkcCn|hkb5WKJ1a~
zO!SAPCmH!O{uLd=G;)vm{^G_P+2MR=F4w8j^9z1R4~*<GqMK(xgZ3PO_au!*bg&iP
zjvX?TSCLr*xt`}=8UNIXuC&4s8aBdySVr?k*ef|-fNr<JK;lOxKQrzy;V(^m-wzDe
zM+yw&dlNd*4jN@wA^xL)WtJXK@B`dA>@cB$cIcGeAv|g^!6ye?rf8PAF{ZzEUmleq
z^RJ{cen$7qbzK)J2eQ`uCbTIbF0|VW8gQXwLOD*$`nrZtg?xQoZD=!`t{WBh{34Wp
zgrYhM8i~t<?sPyB6HQm3IZDzPI)8$;=;OPDa(Q*Iw37}h1B3OHr18Y%EDX-22qlM>
z)U}IU7!SF1VnDhQkiJY@?u&(RS0+iZqh~$z!**F9dB>22_sPSG6^nS(f}dEhybLFo
z;hr-5Z5e)EhL2TabvbUTM)kd*NguK4Gw(rUz<*e6<7aYpGFHy{T-=QEwz!3qWw2GF
zwy`VRLsrI3u~Kf@#XaD>{1a*q8OgVy`ChQcL>;1^D4bPsKDrJSJ0bbq-3H#r&9ds?
z5vk6n3ec%|FCB~*t)eT~XwJuf;SbX>Y<zH<U!tR1$mR{GfIk<UQ3xBK=IO`A+*3|4
zM@G;qEc)TD8Z}qLuI3+Yv;zsja8Z6FVqV0|y^R@_i0O-2*BV4zF5(YFd~%glVLTx-
zvAp|L8$8f;4{D;XIUp0FcD%C|MYlWaR3M6TZW_h+|7QwYK#SN`I1XxbxfSNr&H{eg
z$WM`~JQ~N3^Y~Wd@80<-`l7KHU2215>Wf=#@byaxW}3nbGk)E?n!;rRX+ZVukP??z
zh%cBnLYRU2+u<zZEhSATvjet)7nOEEiMG-#WHBQ&A3!RRr-S;q5<Q|tQfWpFN2$>n
zLg_3eos5zo|1H$iaw;$B49e?h3CN+4$`t{*Hb9X9IzUMpMQ7)QS%0v&)m`u~0ucJU
z2Q1qUSFG8;wgPum;Nc2<vjV?n#a1i+%8LK2!MChfi|TqI#rj6AzGY(7{T}-!_uDtM
zSn4%uL$Yk(3HKA(pNKv7U=*aGQCL7+FVukt6**!1n;tu14sWvjhJ-BG|6_UjCj`s;
zHbO%;95jh6Pk;9wB3?IfLQ$lGDguu8*pZ_eUTOZ-z|V3%Rg?0=TD^8+)xVVYiuj0#
h-x6`Xi0Nw)yic`G5nmDUcOsq^*gbX$va17@{}%-G;lls`

diff --git a/src/field.asm b/src/field.asm
index 5915aca..8a128b1 100644
--- a/src/field.asm
+++ b/src/field.asm
@@ -1279,6 +1279,9 @@ FieldProcess::
     cp a, 0             ; We never want to move if the button wasn't held.
     jr z, .wantright
     ld b, a
+    ldh a, [hCurrentIntegerGravity]
+    cp a, 20            ; No increased DAS at 20G.
+    jr z, .wantright
     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
@@ -1305,6 +1308,9 @@ FieldProcess::
     cp a, 0             ; We never want to move if the button wasn't held.
     jr z, .donemanipulating
     ld b, a
+    ldh a, [hCurrentIntegerGravity]
+    cp a, 20            ; No increased DAS at 20G.
+    jr z, .donemanipulating
     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
@@ -3333,6 +3339,9 @@ BigFieldProcess::
     cp a, 0             ; We never want to move if the button wasn't held.
     jr z, .wantright
     ld b, a
+    ldh a, [hCurrentIntegerGravity]
+    cp a, 20            ; No increased DAS at 20G.
+    jr z, .wantright
     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
@@ -3359,6 +3368,9 @@ BigFieldProcess::
     cp a, 0             ; We never want to move if the button wasn't held.
     jr z, .donemanipulating
     ld b, a
+    ldh a, [hCurrentIntegerGravity]
+    cp a, 20            ; No increased DAS at 20G.
+    jr z, .wantright
     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