From 9097a89bc99f159861d890ebc757f0484ec4c6ff Mon Sep 17 00:00:00 2001
From: Randy Thiemann <randy.thiemann@student.pxl.be>
Date: Thu, 26 Oct 2023 14:29:06 +0200
Subject: [PATCH] Add Line ARE. Improve tells and hold.

---
 bin/DMGTRIS.GBC           | Bin 65536 -> 65536 bytes
 bin/DMGTRIS.pocket        | Bin 65536 -> 65536 bytes
 src/constants.asm         | 300 ++++++++++++++++++++------------------
 src/field.asm             | 192 +++---------------------
 src/gbc.asm               |   4 +-
 src/include/globals.asm   |   5 +
 src/level.asm             |   3 +
 src/res/sources/tiles.gbr | Bin 39009 -> 39009 bytes
 src/res/tiles.inc         |   2 +-
 src/sprites.asm           |  87 ++++++++++-
 src/sram.asm              | 140 +++++++-----------
 src/state_gameplay.asm    |  45 +++---
 src/state_title.asm       |  10 +-
 13 files changed, 363 insertions(+), 425 deletions(-)

diff --git a/bin/DMGTRIS.GBC b/bin/DMGTRIS.GBC
index 20e69593008813d675b86a106dfdae8ea2e30738..6466af9ff4bdd57ca2679048e8b1ad1b6adc0ceb 100644
GIT binary patch
delta 7954
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

delta 8047
zcmZ`-3wRV&mcCV8UHwR>AE5)?1VXg|X(B=-5Ccid_-vdRB`~5W3XHou%<9g7>uBOm
zNXJnW5gD+>0Y{~MA--soal{wP&=9&iDIec{J0FWE7lZ&M!u2)Iv@=zE&aJKxKs#Ue
z{m*~?d+zJpTes5PEp>NGqjy^$QgpS_uR3(1<W2r5er2K&`jEulTRnPe_)DWw@u?>L
zQkCiDDxsG&(=S)wRzLpByxK}Hwn<f_W`+j7%V(%e89k{wsVmP;Hq(>+0%fZ|m?XY2
zEhPy*62HAY)h68Oz2v-5E*BHl3PV$?C1nc}u610{)Wmki>gI%k#2|4g+7kKO658EK
z?*?}Jb*Hhv?WFhQ+3qdv&KrceJqfl;d)Rr+P1**hdQal;{~q`-d!Z{s*V0Gn@97%)
z7<+;)RRy{n2C-5l`te?Ex>LKu$#}&sthmLgZFd@Gj_o!`E<<<Q-qd*4QVC_L*Inc4
zd*}*nqri622ib1=5L;^y#RW0fW*_siqlTb3S>7<W7jNjp?z6)Yk@crS?#iM4fDRkN
zjvKt}p_YCJROKO?-7#TzYMy(zurqa+`vR+-O>U)nS2Nwk9<q9|hSzJRYqC%qtF@#u
z?os1+wS2#%cw?W{&`v{Ern8<F?0d#N!iSCbw9p=mo0{*b8otvYyhFW-LbaDYU|F_)
zq_^fYwcOKEiZrrp0eA)la$={NQ=8n?3x@&tzOJ)R4I%DMus_V`c(c*P9&DixMuxCM
zgUFHW!Dg6M2=$;gctI42JxF(Hn_aMc%h-A&9KVGfNWI`4E2L8&ddDVvx@k{_E(MRU
z!z|MlO;XFX59+dJ89NAT5N3}y(??;2mKSg8GekuK_!vtk*z#_=ysnz9hnUL}?18O~
zUMw+K#LXVC5bJ4%ft}Wy!r#iUiz~LqBN$()NML4R<BA*G_Cedc;VP>=8QY6AV!xI1
z!6C%QMrzq((6iC(0MxIBi6Kga9ZGF0JFgMLgzO<iTo^h7-CYXu32YfS<HZGiMkp>b
z21XTI0X^@=<&F7<BzMZ*ZhAj^BEgn!jR)CIIfN$Gb!fNvc;eVwgx$}#h<2eXuM!x6
zQ5|nEqVYK}x&LKU6spRNVBz9&!(UifZuklhl^fo|mU6>g_@8n^E__*TNCl7I5DQ^{
z9^y-T4ENqE{7J*NSM?jgy$yaNymx}%i0nPrZ;aSm?avPNgUqqVkU?g6P~}5a096&J
zsvJ;>dkiP4T&VJ*%7>}|szQTR5~^fWc~DihHwm(Glm)(D=0=$pgZWV9|9+JVRUTB8
zp{jg9CG0UA*rbF_%BXUo%7ZE|s*-$^AQMsMXk21A8*ek@#(y(hjn^CQ#;YQi!YrV_
z@fL8;Go;2@Ah`l0(?BvIGTL@u3hs&Et^xP3NV!dqj))NjmK9ey4`rlOj<U+6d~S(2
zzf?{xl}%U{kM}|*gbXo$g&`Db0<eayf$XdRTh}Aeb=oRHTN+@$OR!Zl*y`)p!|A7<
zHq3ZH72&94PtujzRTbIwepN#Aak?_w8c+qqDF}L3hCa_yl?k@)FJ7ne9bLy#^R@m4
zws8@AA@xA{RrB8Nr0;0nX)Kjsk92qcMWm0gl`V9oLAGnJRh-&8Ww>`Bxaz?3d6j^{
zVZ#ci<m`Fql(SmE=#=i%>KkCQq$c~D#KnQsZT>1OR$9eN{;KO22YjmZW-hj(S1zlC
zvpp^ulJeKgR>dnzn(gd5+vyx|E<W2SgEKWMz}srJit7Va&33rPvuk(<!quMbEW>b{
ztvH%h=!3$2Svafffq`&`&UOYd+{HoOyLndeo8YOLc=_xa;el{Zp6#q0aIQMrITYJE
z$s5_?3+-?wZ<!k-YlTNd?bjqWYi)6EU(eq5*u!h#fz-3VJyx*}j>MjW?Xg+wiu3z=
zj<jpziKf-7hiHOMS69(1wT+WCeX4d(gVrWwD4a~RptjLo?W3`(gMOi=Xe+F?yoz16
zRryXPyvWDyi?D)BW_XTepG`)x??tl5BH4dNvhC6A+GuufG+Q@1Yecg*jb^<@o8rZ@
zHH2x_+oH%2wV=jnZ^+#i8=n`v1p1vdK-r==Rhbqt;Ho&yrFv*V`=x-nX{8^?;eglR
zrn5_RB=JGCo95vnK;lkq+?dD>Ak(bNfRFV9TMg>|h!?H`BwhjdF!W(JqY1TpGu0yJ
z*-~_)^e{-V8cO?NBb<^F)dyWUB12NU)CetLN0I?r!0Sic!!-DH;5d)KbHcB62&_Q+
z)GDsiK6de|N`z}GtiJQELzgiu95}e|D!BT4BV6rguzNuR^8qbu1v!?>b!`zxg&bSn
zsv7FLR;`3EaNkje|G=W+Jom#B8!BIZUiO+MYex8BeSH4p5|0D$X!i=Nj}}rl*DOg=
zt#=a3X%p*XN-p%esXbF4Ys`gS<Y0O(v<ZRcu7#K|X?c4_e{k|KBbLKVMH+1B4^BRp
z4o5A&W_SU?db3=D?WDO5x--==dbZfqwB`NL)FGTqZI0h5tWS*{_l64}{u5&-Q-{Z0
z5X-QOduJ#`dMmv(pM7TxYwhob_2OKHwuTCGQcbn1ldvtSa9hBpI5`G3!WS9+mOgbg
z-vR0gX!wk6puIMZ9Z9gmGg$xTS7F9v?eD{IRu2FkTD%2sqplVRfwLl8C0<69O7zKb
zSF^=oD_AWFx3$8W@kX$*jGgRv7!JjeT{9l9YlY79Ph&gJ2R&~<8DUMJw?)69Pxq#=
zDPaIYTO;5=fPR2~Zl7Mp{n7x0tJw&=xN`rE$v)l31)_dq2|^!6;FXFCZtBy^O95;M
zC;K_YdFU^1(dYH){<L<}1nh%zuw^(Q%KTE4`F(nz)J+>k960>vl8e}eg~HdSX9;~y
z52icm20fI{zBj=dXcZ1rh<lp{Mwb~tFwQC*r-W{MoS6Xx!>qz#is-h7mKi`WNPcfj
z^6K``GP;dmkTD#jGhW_2cvzXi28^)^$H;qV4=khGs5C@ALLWJ6g!B5e^%IhV$DQZX
zsz}1N>+&!>N%-}wJl>>*=Gl4Zuq50Er3B@^*?FPsr?x!y3D6*q`DSu?tox^29#buO
zY}xF5?9N$vZSe&5+?z_6ZP=;=pzS3v;TO>7I$_4?hS1k0P*L{WyUH-O;T@#{)C>MS
ziW*x23#P3bllu1j`vhOAYeGaQPyK$v&yvsK0K0lG><=W=OS)sXJ=V@Fszm&!P1Kwc
zEjq=OREr;L&o(uw-Sk{IOvb3~6p#DQ=yCcvJ&~cusGet^CD?KL8T*_bXD8_A;6Blj
zPq5@5u7jR{S7H#e&x{j_1iLq{b=DcCGS(^-tBCR<hwcPBwutEqUynOGwAFR_4yfj*
zpQ&zo4BoeOZOtU02)vP>Msx#_1jUb0kwl3I%rsywx9j{Ch`B(_v<U%-79cLQiMxTg
z0Eihj;Q*orh%0R39w5E}VwO!vK)g3taW4?bi-5VtmN<dA9f*WYECnJ3#B7_8f%p>;
z({18DAl3kJokbX4u#bU#WyxL+_FZ6KU$V=<z7OoVmJM$sK=^^Uu_P!5J37ergZ;Zf
zb^z>Zux~2qgJ5G9=a=lzcJ&093oKK;h=%A;SnVpRz?y_<lvdN4Q^_&g&JI{Qr|ft?
z;*iDnORK7g`}18jhM_q3YfsnV16!WaRdX=%*%ErJlj{5Px+AB%a(Y=#59E5hx|q}D
zobJu({?wb3Mx-v9G<kF|Cj`k*qOBl#eMn9pmeZ?p`Y04v<n*CAeRxi<M)BlOuD0iP
zy^{Y%b6tQ(=5D^Vwx>-G0@tR8`ELX~ZTg5@zNSWyNGecYedX|;OWHj{^6FxE%r@L!
z(_T}PP=~d5^tfZA&#>cX*yB&PQ+4&xBve&9;5pr}Y;dIJGwjwg?8{2FReO4_;gP|$
ze{zQ1c7}aT$%fj=Jd-xjJ<Pd@{vV>fh&~FX=fo!T2{m}{3uWiTX7&j##M<=@aCrV5
z4(V@b4i9sO;sQ>mW*+Wf`{>8?6T07en8~V$#-JK-Hh)3)p_WnxE(U5Ag-UQ0+?NL-
zg`2H&{>XSG;Ml%YdU7<0z}y!9x@KFP!S^_Pk49eMesi1hEC6M_>Vi6oHlsnG(>EiN
zfR1~*c&%fgJ`CRj@cme;ngYX^Tr=p8?L_&^K2JNu(XZ!~!I}qD?b~s8qdY&=IOXQ?
z6Q&rXFnJ0*;b%^PSNqN>@PhcODcZj@^j~Du)P0*r<T6}<Vjrb?rYOmc^ac7NeTlwI
zU!j}mX8J099%d(FowBuw{s4WY1CL+&GB;kbj2D;CXFBP#wRB@GeSte(wH%wdk+F<T
z+CMMM$6hp5&xRWQceUZk@%PDvzgfCy#Txp;5;xt*UZQ`Dy^{K6Lv6Cukyv2t61uUI
zz5w;rAfBXl5W}OK1Gm*pG=p7@y=>M3)7E9Ul^?^VeO~p0I8q;b$?O6?7|WQMcBtCb
z9NT2JM?A<k1KExhH-N%3P>KC9!Cp#kjXTu<gkVqgvv?T}8)|Qh3m*Uxh`XRZH=Z8w
zzHAfdeT5r1X7<b?_UytM_|($%wKQEzAFri<sHIQT(kE-_)3x*|YyS8hCZ~q!dgw?x
zpHwf?Nm{*17t(4%7t`t#-H}!a+``~u0`Kr;X}E#FZOoU3s|N7pX}D5A=}*JO0m?uc
zt_SK7T}rE7-I-R0>vCFk>#npqQFo`+YTc8D$NA}(0+Kc^Q|>PcY2zv-*<BRVMq<b0
z#-bx_Ou<r08%LB^iq15g+#8B=+8C~^FS^n&;cJWTv@uaxUG$`lYGrwmce2R4SmYfn
z^6nLR=Zd^*MSR>B@j?I((gXA${gfV}hiN}OLXYOvAWafh`b+e-DrN98VaDCf@cQJ)
z(8Imcf$6uHeq{Q4+kiQ0F-MU(+B*lBBNlT6nIoz~2L;6n2Q2pibRXaq4qD8?ND`=n
zyq!-i>QfYb%KLK2Vh$m52(His{znY|^Mije!$4p-uhT!#H|SRSCVh*(P2Yj_e3x#c
z|4p~kKhqug(@pmFBKFS0(7UF<_Gs!fA@UFWecYT2h5xVcGabH>;i}o}Y5d2oZ#pI>
z?wUBmvG3YxUwHmpF(hA>kG*YX&S?+rFlC~eTNO#Fiu|2HI}BQ5&?bYH8ML3F?>giA
zV{e(E9VvP0DBtUbcMo)x@2S+$sUyW-HKknB)HzzcHi~E)8nw5H_B7E(PSqCFS^uJR
zmEKUa4Fulg;L4&+oT}|6v8$Wd7uNfFWPG+WVyoUWW4{>i1Sf8JV%i$%wboBu!rfc;
zCmKA-VD-2<QcZ{;$kl+SkQ&5p#H}Qb*o(N0OhW8Kynr+#4kBJmu0X6H?j~)B>kzLZ
zHz00BOoV?WL=@T(D?$h21&CXP6(kA9Vl);AX>@cWUM#$bcokwI<_K{J5@JQ%hnP23
zC-x)e4b+Rr5c8l7;&H@0&Q$Rv;xyL1RQw9@cEkybr+|~=W{TgT!$b#hj2DO`a$M*5
z5nu<$3mm@yELj?9l|Y<Mjuq)yz!u*o?Eq})iSuiL$YHKAO@bdmaC(E$P-!k?j$vp?
zXxhaM-n8K6m^UGKIOd^*GLGdrB5?_Rj$QAF#4Ut5b}J6z5fqL+_c};WIFIAtQ3nYL
z^&AfgJ4sk*<#=eTOoj=w0VhKw`X4T$2;JN<?wT@ECzy!q>z(CfvS@mJ(a>d=-54U5
zJ2;*_drKv`R^s^QKlctN3!NOdxBsk~bc9W>I~rQHZ0kAX0l;!aXx+NN*mdi|rc?HN
z2j)Vm3RcH4?~*VvG8%T`A+{3_v7LB`?ZiWDCmv!u@etdIhuBU$#CGB##>B(C1DuT8
ziH8n5@etdIhuBU$#CGB#wi6Grop^}t#6xT+9%4K35L<bd6ihVi#6xT+9%4K3xTchN
zi0#BfY$qPqloF3)o-JXs%3JLsJX^wM1!A5pVbkxe7D$q(3mEPSf$($*n{Ic7OhS-4
z6=Bom_RFLK@Q|=61GZNXLiwtFM1af|p|&q75D~Bga9LO&4!{yb@<JpDu#-n}5+`8T
z7Z6FZBEkBHO&`kmApzK3;k2e6aZs{m#;Rg(D_Qo5B=i#rJ1EOukyLD!cn4*-Xm?Nu
zM*Y?CN)o`W7eZV*<|+`EGAtZTf>BDbN_3P`Y#8EFiVa6xO0f}$ODU!xE~VHQ#BIW(
zm{#X;-a5AG5swiM;0e>pHDVF*Y{YknLj>Ia-MoUe|4qP3n`55P<`6k1xax2Wah@MB
z632H)AMs-dd3#;}M@VVaqi(>ZRSzRBEp$+h2JN}?$<buco;)zzFo|$T;JyvJNVvmE
zD)}CkN##B#84Bwu1);>l1F>Hs!=9B%1QtQ^IY`9qB2mO%hjpfeO-XV)i1LAp!~i=0
zkJ;%V=Y~yDaEqjFYZ<v<QrLv2jX+w{0dg^7Ss-o8hLD+vCBZsi5Q~C+kZhSgXY1Hh
LThq#?ySx7%3xi!$

diff --git a/bin/DMGTRIS.pocket b/bin/DMGTRIS.pocket
index 3949b45b9616a59a35dad3fa2be334289a9b0925..908be6bede57abf33c0937659e89e77ea3722bec 100644
GIT binary patch
delta 8085
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

delta 8166
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

diff --git a/src/constants.asm b/src/constants.asm
index c46d3d2..06a1119 100644
--- a/src/constants.asm
+++ b/src/constants.asm
@@ -131,126 +131,135 @@ sPieceYOffsets::    ; How to draw each piece. Y-offsets of the sprites.
     db 0, 7, 0, 7   ; O
     db 0, 0, 7, 0   ; T
 
+; Speed curve data is defined as follows:
+; N blocks of:
+;   dw BCD_START_LEVEL, START_LEVEL, BCD_NEXT_100_LEVEL_BREAKPOINT
+;   db GRID_CELLS_PER_MOVE_ON_OVERFLOW, INCREMENT_PER_FRAME
+;   db NORMAL_ARE, LINE_ARE, DAS, LOCK_DELAY, CLEAR_DELAY
+;
+; Followed by one single:
+;   dw $FFFF
+
 sTGM1SpeedCurve::
     dw $0000, 0, $0100
     db 1, 4
-    db 30, 16, 30, 41
+    db 30, 30, 16, 30, 41
 
     dw $0030, 30, $0100
     db 1, 6
-    db 30, 16, 30, 41
+    db 30, 30, 16, 30, 41
 
     dw $0035, 35, $0100
     db 1, 8
-    db 30, 16, 30, 41
+    db 30, 30, 16, 30, 41
 
     dw $0040, 40, $0100
     db 1, 10
-    db 30, 16, 30, 41
+    db 30, 30, 16, 30, 41
 
     dw $0050, 50, $0100
     db 1, 12
-    db 30, 16, 30, 41
+    db 30, 30, 16, 30, 41
 
     dw $0060, 60, $0100
     db 1, 16
-    db 30, 16, 30, 41
+    db 30, 30, 16, 30, 41
 
     dw $0070, 70, $0100
     db 1, 32
-    db 30, 16, 30, 41
+    db 30, 30, 16, 30, 41
 
     dw $0080, 80, $0100
     db 1, 48
-    db 30, 16, 30, 41
+    db 30, 30, 16, 30, 41
 
     dw $0090, 90, $0100
     db 1, 64
-    db 30, 16, 30, 41
+    db 30, 30, 16, 30, 41
 
     dw $0100, 100, $0200
     db 1, 80
-    db 30, 16, 30, 41
+    db 30, 30, 16, 30, 41
 
     dw $0120, 120, $0200
     db 1, 96
-    db 30, 16, 30, 41
+    db 30, 30, 16, 30, 41
 
     dw $0140, 140, $0200
     db 1, 112
-    db 30, 16, 30, 41
+    db 30, 30, 16, 30, 41
 
     dw $0160, 160, $0200
     db 1, 128
-    db 30, 16, 30, 41
+    db 30, 30, 16, 30, 41
 
     dw $0170, 170, $0200
     db 1, 144
-    db 30, 16, 30, 41
+    db 30, 30, 16, 30, 41
 
     dw $0200, 200, $0300
     db 1, 4
-    db 30, 16, 30, 41
+    db 30, 30, 16, 30, 41
 
     dw $0220, 220, $0300
     db 1, 32
-    db 30, 16, 30, 41
+    db 30, 30, 16, 30, 41
 
     dw $0230, 230, $0300
     db 1, 64
-    db 30, 16, 30, 41
+    db 30, 30, 16, 30, 41
 
     dw $0233, 233, $0300
     db 1, 96
-    db 30, 16, 30, 41
+    db 30, 30, 16, 30, 41
 
     dw $0236, 236, $0300
     db 1, 128
-    db 30, 16, 30, 41
+    db 30, 30, 16, 30, 41
 
     dw $0239, 239, $0300
     db 1, 160
-    db 30, 16, 30, 41
+    db 30, 30, 16, 30, 41
 
     dw $0243, 243, $0300
     db 1, 192
-    db 30, 16, 30, 41
+    db 30, 30, 16, 30, 41
 
     dw $0247, 239, $0300
     db 1, 224
-    db 30, 16, 30, 41
+    db 30, 30, 16, 30, 41
 
     dw $0251, 251, $0300
     db 1, $FF
-    db 30, 16, 30, 41
+    db 30, 30, 16, 30, 41
 
     dw $0300, 300, $0400
     db 2, $FF
-    db 30, 16, 30, 41
+    db 30, 30, 16, 30, 41
 
     dw $0330, 330, $0400
     db 3, $FF
-    db 30, 16, 30, 41
+    db 30, 30, 16, 30, 41
 
     dw $0360, 360, $0400
     db 4, $FF
-    db 30, 16, 30, 41
+    db 30, 30, 16, 30, 41
 
     dw $0400, 400, $0500
     db 5, $FF
-    db 30, 16, 30, 41
+    db 30, 30, 16, 30, 41
 
     dw $0420, 420, $0500
     db 4, $FF
-    db 30, 16, 30, 41
+    db 30, 30, 16, 30, 41
 
     dw $0450, 450, $0500
     db 3, $FF
-    db 30, 16, 30, 41
+    db 30, 30, 16, 30, 41
 
     dw $0500, 500, $0600
     db 20, $FF
-    db 30, 16, 30, 41
+    db 30, 30, 16, 30, 41
 
 sTGM1SpeedCurveEnd::
     dw $FFFF
@@ -259,91 +268,91 @@ sTGM1SpeedCurveEnd::
 sCHILSpeedCurve::
     dw $0000, 0, $0100
     db 1, 5
-    db 10, 16, 25, 17
+    db 10, 10, 16, 25, 17
 
     dw $0100, 100, $0200
     db 1, 6
-    db 10, 16, 25, 17
+    db 10, 10, 16, 25, 17
 
     dw $0200, 200, $0300
     db 1, 7
-    db 10, 16, 25, 17
+    db 10, 10, 16, 25, 17
 
     dw $0300, 300, $0400
     db 1, 8
-    db 10, 16, 25, 17
+    db 10, 10, 16, 25, 17
 
     dw $0400, 400, $0500
     db 1, 9
-    db 10, 16, 25, 17
+    db 10, 10, 16, 25, 17
 
     dw $0500, 500, $0600
     db 1, 11
-    db 10, 16, 25, 17
+    db 10, 10, 16, 25, 17
 
     dw $0600, 600, $0700
     db 1, 14
-    db 10, 16, 25, 17
+    db 10, 10, 16, 25, 17
 
     dw $0700, 700, $0800
     db 1, 20
-    db 10, 16, 25, 17
+    db 10, 10, 16, 25, 17
 
     dw $0800, 800, $0900
     db 1, 32
-    db 10, 16, 25, 17
+    db 10, 10, 16, 25, 17
 
     dw $0900, 900, $1000
     db 1, 43
-    db 10, 16, 25, 17
+    db 10, 10, 16, 25, 17
 
     dw $1000, 1000, $1100
     db 1, 51
-    db 10, 16, 25, 17
+    db 10, 10, 16, 25, 17
 
     dw $1300, 1300, $1400
     db 1, 64
-    db 10, 16, 25, 17
+    db 10, 10, 16, 25, 17
 
     dw $1600, 1600, $1700
     db 1, 85
-    db 10, 16, 25, 17
+    db 10, 10, 16, 25, 17
 
     dw $1900, 1900, $2000
     db 1, 128
-    db 10, 16, 25, 17
+    db 10, 10, 16, 25, 17
 
     dw $2900, 2900, $3000
     db 1, $FF
-    db 10, 16, 25, 17
+    db 10, 10, 16, 25, 17
 
     dw $3333, 3333, $3400
     db 2, $FF
-    db 10, 12, 25, 17
+    db 10, 10, 12, 25, 17
 
     dw $4444, 4444, $4500
     db 3, $FF
-    db 10, 12, 25, 17
+    db 10, 10, 12, 25, 17
 
     dw $5555, 5555, $5600
     db 4, $FF
-    db 10, 12, 25, 17
+    db 10, 10, 12, 25, 17
 
     dw $6666, 6666, $6700
     db 5, $FF
-    db 10, 12, 25, 17
+    db 10, 10, 12, 25, 17
 
     dw $7777, 7777, $7800
     db 20, $FF
-    db 10, 8, 25, 17
+    db 10, 10, 8, 25, 17
 
     dw $8888, 8888, $8900
     db 20, $FF
-    db 10, 6, 18, 17
+    db 10, 10, 6, 18, 17
 
     dw $9999, 9999, $9999
     db 20, $FF
-    db 5, 6, 14, 10
+    db 5, 5, 6, 14, 10
 
 sCHILSpeedCurveEnd::
     dw $FFFF
@@ -352,151 +361,151 @@ sCHILSpeedCurveEnd::
 sTGM3SpeedCurve::
     dw $0000, 0, $0100
     db 1, 4
-    db 27, 16, 30, 40
+    db 27, 27, 16, 30, 40
 
     dw $0030, 30, $0100
     db 1, 6
-    db 27, 16, 30, 40
+    db 27, 27, 16, 30, 40
 
     dw $0035, 35, $0100
     db 1, 8
-    db 27, 16, 30, 40
+    db 27, 27, 16, 30, 40
 
     dw $0040, 40, $0100
     db 1, 10
-    db 27, 16, 30, 40
+    db 27, 27, 16, 30, 40
 
     dw $0050, 50, $0100
     db 1, 12
-    db 27, 16, 30, 40
+    db 27, 27, 16, 30, 40
 
     dw $0060, 60, $0100
     db 1, 16
-    db 27, 16, 30, 40
+    db 27, 27, 16, 30, 40
 
     dw $0070, 70, $0100
     db 1, 32
-    db 27, 16, 30, 40
+    db 27, 27, 16, 30, 40
 
     dw $0080, 80, $0100
     db 1, 48
-    db 27, 16, 30, 40
+    db 27, 27, 16, 30, 40
 
     dw $0090, 90, $0100
     db 1, 64
-    db 27, 16, 30, 40
+    db 27, 27, 16, 30, 40
 
     dw $0100, 100, $0200
     db 1, 80
-    db 27, 16, 30, 40
+    db 27, 27, 16, 30, 40
 
     dw $0120, 120, $0200
     db 1, 96
-    db 27, 16, 30, 40
+    db 27, 27, 16, 30, 40
 
     dw $0140, 140, $0200
     db 1, 112
-    db 27, 16, 30, 40
+    db 27, 27, 16, 30, 40
 
     dw $0160, 160, $0200
     db 1, 128
-    db 27, 16, 30, 40
+    db 27, 27, 16, 30, 40
 
     dw $0170, 170, $0200
     db 1, 144
-    db 27, 16, 30, 40
+    db 27, 27, 16, 30, 40
 
     dw $0200, 200, $0300
     db 1, 4
-    db 27, 16, 30, 40
+    db 27, 27, 16, 30, 40
 
     dw $0220, 220, $0300
     db 1, 32
-    db 27, 16, 30, 40
+    db 27, 27, 16, 30, 40
 
     dw $0230, 230, $0300
     db 1, 64
-    db 27, 16, 30, 40
+    db 27, 27, 16, 30, 40
 
     dw $0233, 233, $0300
     db 1, 96
-    db 27, 16, 30, 40
+    db 27, 27, 16, 30, 40
 
     dw $0236, 236, $0300
     db 1, 128
-    db 27, 16, 30, 40
+    db 27, 27, 16, 30, 40
 
     dw $0239, 239, $0300
     db 1, 160
-    db 27, 16, 30, 40
+    db 27, 27, 16, 30, 40
 
     dw $0243, 243, $0300
     db 1, 192
-    db 27, 16, 30, 40
+    db 27, 27, 16, 30, 40
 
     dw $0247, 239, $0300
     db 1, 224
-    db 27, 16, 30, 40
+    db 27, 27, 16, 30, 40
 
     dw $0251, 251, $0300
     db 1, $FF
-    db 27, 16, 30, 40
+    db 27, 27, 16, 30, 40
 
     dw $0300, 300, $0400
     db 2, $FF
-    db 27, 16, 30, 40
+    db 27, 27, 16, 30, 40
 
     dw $0330, 330, $0400
     db 3, $FF
-    db 27, 16, 30, 40
+    db 27, 27, 16, 30, 40
 
     dw $0360, 360, $0400
     db 4, $FF
-    db 27, 16, 30, 40
+    db 27, 27, 16, 30, 40
 
     dw $0400, 400, $0500
     db 5, $FF
-    db 27, 16, 30, 40
+    db 27, 27, 16, 30, 40
 
     dw $0420, 420, $0500
     db 4, $FF
-    db 27, 16, 30, 40
+    db 27, 27, 16, 30, 40
 
     dw $0450, 450, $0500
     db 3, $FF
-    db 27, 16, 30, 40
+    db 27, 27, 16, 30, 40
 
     dw $0500, 500, $0600
     db 20, $FF
-    db 27, 16, 30, 40
+    db 27, 27, 10, 30, 25
 
     dw $0600, 600, $0700
     db 20, $FF
-    db 27, 10, 30, 7
+    db 27, 18, 10, 30, 16
 
     dw $0700, 700, $0800
     db 20, $FF
-    db 18, 10, 30, 7
+    db 18, 14, 10, 30, 12
 
     dw $0800, 800, $0900
     db 20, $FF
-    db 14, 10, 30, 1
+    db 14, 8, 10, 30, 6
 
     dw $0900, 900, $1000
     db 20, $FF
-    db 14, 8, 18, 1
+    db 14, 8, 8, 17, 6
 
     dw $1000, 1000, $1100
     db 20, $FF
-    db 8, 8, 18, 6
+    db 8, 8, 8, 17, 6
 
     dw $1100, 1000, $1200
     db 20, $FF
-    db 7, 8, 14, 6
+    db 7, 7, 8, 15, 6
 
     dw $1200, 1000, $1300
     db 20, $FF
-    db 6, 8, 14, 6
+    db 6, 6, 8, 15, 6
 
 sTGM3SpeedCurveEnd::
     dw $FFFF
@@ -504,27 +513,27 @@ sTGM3SpeedCurveEnd::
 sDEATSpeedCurve::
     dw $0000, 0, $0100
     db 20, $FF
-    db 18, 12, 30, 12
+    db 18, 14, 12, 30, 12
 
     dw $0100, 0, $0200
     db 20, $FF
-    db 14, 12, 25, 1
+    db 14, 8, 12, 26, 6
 
     dw $0200, 0, $0300
     db 20, $FF
-    db 14, 11, 20, 1
+    db 14, 8, 11, 22, 6
 
     dw $0300, 0, $0400
     db 20, $FF
-    db 8, 10, 18, 6
+    db 8, 8, 10, 18, 6
 
     dw $0400, 0, $0500
     db 20, $FF
-    db 7, 8, 14, 5
+    db 7, 7, 8, 15, 5
 
     dw $0500, 0, $0600
     db 20, $FF
-    db 6, 8, 14, 4
+    db 6, 6, 8, 15, 4
 
 sDEATSpeedCurveEnd::
     dw $FFFF
@@ -532,198 +541,199 @@ sDEATSpeedCurveEnd::
 sSHIRSpeedCurve::
     dw $0000, 0, $0100
     db 20, $FF
-    db 12, 10, 18, 6
+    db 12, 8, 10, 18, 6
 
     dw $0100, 100, $0200
     db 20, $FF
-    db 12, 8, 18, 5
+    db 12, 7, 8, 18, 5
 
     dw $0200, 200, $0300
     db 20, $FF
-    db 12, 8, 16, 4
+    db 12, 6, 8, 17, 4
 
     dw $0300, 300, $0400
     db 20, $FF
-    db 6, 8, 14, 4
+    db 6, 6, 8, 15, 4
 
     dw $0500, 500, $0600
     db 20, $FF
-    db 6, 6, 12, 2
+    db 6, 5, 6, 13, 3
 
     dw $1100, 1100, $1200
     db 20, $FF
-    db 6, 6, 10, 2
+    db 6, 5, 6, 10, 3
 
     dw $1200, 1200, $1300
     db 20, $FF
-    db 6, 6, 8, 2
+    db 6, 5, 6, 8, 3
 
 sSHIRSpeedCurveEnd::
     dw $FFFF
 
-sSpeedCurve::           ; Speed curve of the game.
+sDMGTSpeedCurve::       ; Speed curve of the game.
     dw $0000, 0, $0100  ; Level 0000
     db 1, 16
-    db 25, 14, 30, 40
+    db 25, 15, 14, 30, 40
 
     dw $0015, 15, $0100 ; Level 0015
     db 1, 17
-    db 25, 14, 30, 40
+    db 25, 15, 14, 30, 40
 
     dw $0030, 30, $0100 ; Level 0030
     db 1, 18
-    db 25, 14, 30, 40
+    db 25, 15, 14, 30, 40
 
     dw $0040, 40, $0100 ; Level 0040
     db 1, 20
-    db 25, 14, 30, 40
+    db 25, 15, 14, 30, 40
 
     dw $0050, 50, $0100 ; Level 0050
     db 1, 21
-    db 25, 14, 30, 40
+    db 25, 15, 14, 30, 40
 
     dw $0060, 60, $0100 ; Level 0060
     db 1, 23
-    db 25, 14, 30, 40
+    db 25, 15, 14, 30, 40
 
     dw $0070, 70, $0100 ; Level 0070
     db 1, 26
-    db 25, 14, 30, 40
+    db 25, 15, 14, 30, 40
 
     dw $0080, 80, $0100 ; Level 0080
     db 1, 28
-    db 25, 14, 30, 40
+    db 25, 15, 14, 30, 40
 
     dw $0090, 90, $0100 ; Level 0090
     db 1, 32
-    db 25, 14, 30, 40
+    db 25, 15, 14, 30, 40
 
     dw $0100, 100, $0200 ; Level 0100
     db 1, 37
-    db 25, 14, 30, 40
+    db 25, 15, 14, 30, 40
 
     dw $0150, 150, $0200 ; Level 0150
     db 1, 43
-    db 25, 14, 30, 40
+    db 25, 15, 14, 30, 40
 
     dw $0200, 200, $0300 ; Level 0200
     db 1, 51
-    db 25, 14, 30, 40
+    db 25, 15, 14, 30, 40
 
     dw $0225, 225, $0300 ; Level 0225
     db 1, 64
-    db 25, 14, 30, 40
+    db 25, 15, 14, 30, 40
 
     dw $0250, 250, $0300 ; Level 0250
     db 1, 85
-    db 25, 14, 30, 40
+    db 25, 15, 14, 30, 40
 
     dw $0275, 275, $0300 ; Level 0275
     db 1, 128
-    db 25, 14, 30, 40
+    db 25, 15, 14, 30, 40
 
     dw $0300, 300, $0400 ; Level 0300
     db 1, $FF
-    db 25, 14, 30, 32
+    db 25, 7, 14, 30, 32
 
     dw $0350, 350, $0350 ; Level 0350
     db 2, $FF
-    db 25, 14, 30, 32
+    db 25, 7, 14, 30, 32
 
     dw $0400, 400, $0400 ; Level 0400
     db 3, $FF
-    db 25, 14, 30, 32
+    db 25, 7, 14, 30, 32
 
     dw $0450, 450, $0500 ; Level 0450
     db 4, $FF
-    db 25, 14, 30, 32
+    db 25, 7, 14, 30, 32
 
     dw $0475, 475, $0500 ; Level 0475
     db 5, $FF
-    db 25, 14, 30, 32
+    db 25, 7, 14, 30, 32
 
     dw $0500, 500, $0600 ; Level 0500
     db 20, $FF
-    db 25, 14, 30, 24
+    db 25, 6, 14, 30, 24
 
     dw $0600, 600, $0700 ; Level 0600
     db 20, $FF
-    db 25, 8, 30, 24
+    db 25, 6, 8, 30, 24
 
     dw $0700, 700, $0800 ; Level 0700
     db 20, $FF
-    db 20, 8, 30, 24
+    db 20, 6, 8, 30, 24
 
     dw $0900, 900, $1000 ; Level 0900
     db 20, $FF
-    db 16, 6, 25, 16
+    db 16, 4, 6, 25, 16
 
     dw $1100, 1100, $1200 ; Level 1100
     db 20, $FF
-    db 12, 6, 25, 16
+    db 12, 4, 6, 25, 16
 
     dw $1200, 1200, $1300 ; Level 1200
     db 20, $FF
-    db 12, 6, 25, 8
+    db 12, 4, 6, 25, 8
 
     dw $1300, 1300, $1400 ; Level 1300
     db 20, $FF
-    db 10, 6, 20, 7
+    db 10, 4, 6, 20, 7
 
     dw $1400, 1400, $1500 ; Level 1400
     db 20, $FF
-    db 10, 6, 18, 6
+    db 10, 4, 6, 18, 6
 
     dw $1500, 1500, $1600 ; Level 1500
     db 20, $FF
-    db 8, 4, 16, 5
+    db 8, 4, 4, 16, 5
 
     dw $1600, 1600, $1700 ; Level 1600
     db 20, $FF
-    db 8, 4, 14, 4
+    db 8, 4, 4, 14, 4
 
     dw $1700, 1700, $1800 ; Level 1700
     db 20, $FF
-    db 6, 4, 12, 3
+    db 6, 4, 4, 12, 3
 
     dw $1800, 1800, $1900 ; Level 1800
     db 20, $FF
-    db 6, 4, 10, 3
+    db 6, 4, 4, 10, 3
 
     dw $1900, 1900, $2000 ; Level 1900
     db 20, $FF
-    db 4, 4, 8, 3
+    db 4, 4, 4, 8, 3
 
     dw $2000, 2000, $2100 ; Level 2000
     db 20, $FF
-    db 4, 3, 8, 3
+    db 4, 4, 3, 8, 3
 
     dw $2500, 2500, $2600 ; Level 2500
     db 20, $FF
-    db 2, 1, 8, 2
+    db 2, 2, 1, 8, 2
 
     dw $3000, 3000, $3100 ; Level 3000
     db 20, $FF
-    db 1, 1, 8, 1
+    db 1, 1, 1, 8, 1
 
     dw $4000, 4000, $4100 ; Level 4000
     db 20, $FF
-    db 1, 1, 6, 1
+    db 1, 1, 1, 6, 1
 
     dw $5000, 5000, $5100 ; Level 5000
     db 20, $FF
-    db 1, 1, 4, 1
+    db 1, 1, 1, 4, 1
 
     dw $6666, 6666, $6700 ; Level 6666
     db 20, $FF
-    db 1, 1, 2, 1
+    db 1, 1, 1, 2, 1
 
     dw $9999, 9999, $9999 ; Level 9999
     db 20, $FF
-    db 1, 1, 1, 1
+    db 1, 1, 1, 1, 1
+
+sDMGTSpeedCurveEnd::
+    dw $FFFF              ; End.
 
-sSpeedCurveEnd::
-    dw $FFFF          ; End.
 
 
 sPieceFastRotationStates::
diff --git a/src/field.asm b/src/field.asm
index 6e34870..e8bae00 100644
--- a/src/field.asm
+++ b/src/field.asm
@@ -1527,36 +1527,14 @@ FieldProcess::
 
 
 GetTileShade:
-    ; Possible values for tile delay:
-    ; 30, 25, 20, 18, 16, 14, 12, 10, 8, 6, 4, 2, 1
-    ; We don't need to handle the 1 case.
-    ld a, 0
-    ld b, a
-:   ldh a, [hCurrentLockDelay]
+    ldh a, [hCurrentLockDelay]
     cp a, 30
-    jr z, .max30
-:   cp a, 25
-    jr z, .max25
-:   cp a, 20
-    jr z, .max20
-:   cp a, 18
-    jp z, .max18
-:   cp a, 16
-    jp z, .max16
-:   cp a, 14
-    jp z, .max14
-:   cp a, 12
-    jp z, .max12
-:   cp a, 10
-    jp z, .max10
-:   cp a, 8
-    jp z, .max8
-:   cp a, 6
-    jp z, .max6
-:   cp a, 4
-    jp z, .max4
-:   cp a, 2
-    jp z, .max2
+    jr nc, .max30
+    cp a, 20
+    jr nc, .max20
+    cp a, 10
+    jr nc, .max10
+    jr .max0
     ret
 .max30
     ldh a, [hCurrentLockDelayRemaining]
@@ -1565,136 +1543,34 @@ GetTileShade:
     cp a, 8
     jp c, .s6
     cp a, 12
-    jp c, .s5
+    jr c, .s5
     cp a, 16
-    jp c, .s4
+    jr c, .s4
     cp a, 20
-    jp c, .s3
+    jr c, .s3
     cp a, 24
-    jp c, .s2
+    jr c, .s2
     cp a, 28
-    jp c, .s1
-    jp .s0
-.max25
-    ldh a, [hCurrentLockDelayRemaining]
-    cp a, 3
-    ret c
-    cp a, 6
-    jp c, .s6
-    cp a, 9
-    jp c, .s5
-    cp a, 12
-    jp c, .s4
-    cp a, 15
-    jp c, .s3
-    cp a, 18
-    jp c, .s2
-    cp a, 21
-    jp c, .s1
-    jp .s0
+    jr c, .s1
+    jr .s0
 .max20
     ldh a, [hCurrentLockDelayRemaining]
     cp a, 2
     ret c
     cp a, 5
-    jp c, .s6
+    jr c, .s6
     cp a, 7
-    jp c, .s5
-    cp a, 10
-    jp c, .s4
-    cp a, 12
-    jp c, .s3
-    cp a, 15
-    jp c, .s2
-    cp a, 17
-    jp c, .s1
-    jp .s0
-.max18
-    ldh a, [hCurrentLockDelayRemaining]
-    cp a, 2
-    ret c
-    cp a, 4
-    jp c, .s6
-    cp a, 6
-    jp c, .s5
-    cp a, 9
-    jp c, .s4
-    cp a, 11
-    jp c, .s3
-    cp a, 13
-    jp c, .s2
-    cp a, 15
-    jp c, .s1
-    jp .s0
-.max16
-    ldh a, [hCurrentLockDelayRemaining]
-    cp a, 2
-    ret c
-    cp a, 4
-    jp c, .s6
-    cp a, 6
-    jp c, .s5
-    cp a, 8
-    jp c, .s4
-    cp a, 10
-    jp c, .s3
-    cp a, 12
-    jp c, .s2
-    cp a, 14
-    jp c, .s1
-    jp .s0
-.max14
-    ldh a, [hCurrentLockDelayRemaining]
-    cp a, 2
-    ret c
-    cp a, 4
-    jp c, .s6
-    cp a, 6
-    jp c, .s5
-    cp a, 7
-    jp c, .s4
-    cp a, 9
-    jp c, .s3
-    cp a, 11
-    jp c, .s2
-    cp a, 13
-    jp c, .s1
-    jp .s0
-.max12
-    ldh a, [hCurrentLockDelayRemaining]
-    cp a, 1
-    ret c
-    cp a, 3
-    jp c, .s6
-    cp a, 4
-    jp c, .s5
-    cp a, 6
-    jp c, .s4
-    cp a, 7
-    jp c, .s3
-    cp a, 9
-    jp c, .s2
-    cp a, 10
-    jp c, .s1
-    jp .s0
-.max10
-    ldh a, [hCurrentLockDelayRemaining]
-    cp a, 1
-    ret c
-    cp a, 2
-    jp c, .s6
-    cp a, 3
     jr c, .s5
-    cp a, 5
+    cp a, 10
     jr c, .s4
-    cp a, 6
+    cp a, 12
     jr c, .s3
-    cp a, 7
+    cp a, 15
     jr c, .s2
-    cp a, 8
+    cp a, 17
     jr c, .s1
     jr .s0
-.max8
+.max10
     ldh a, [hCurrentLockDelayRemaining]
     cp a, 1
     ret c
@@ -1702,36 +1578,16 @@ GetTileShade:
     jr c, .s6
     cp a, 3
     jr c, .s5
-    cp a, 4
-    jr c, .s4
     cp a, 5
-    jr c, .s3
+    jr c, .s4
     cp a, 6
-    jr c, .s2
-    cp a, 7
-    jr c, .s1
-    jr .s0
-.max6
-    ldh a, [hCurrentLockDelayRemaining]
-    cp a, 1
-    ret c
-    cp a, 2
-    jr c, .s5
-    cp a, 3
     jr c, .s3
-    cp a, 4
+    cp a, 7
     jr c, .s2
-    cp a, 5
+    cp a, 8
     jr c, .s1
     jr .s0
-.max4
-    ldh a, [hCurrentLockDelayRemaining]
-    cp a, 1
-    ret c
-    cp a, 2
-    jr c, .s4
-    jr .s0
-.max2
+.max0
     jr .s4
 .s0
     ldh a, [hCurrentPiece]
@@ -1974,7 +1830,7 @@ FieldDelay::
     ld a, SFX_LINE_CLEAR
     call SFXEnqueue
 
-:   ldh a, [hCurrentARE]
+:   ldh a, [hCurrentLineARE]
     ldh [hRemainingDelay], a
 
 
diff --git a/src/gbc.asm b/src/gbc.asm
index 6ee2f68..5125e7a 100644
--- a/src/gbc.asm
+++ b/src/gbc.asm
@@ -924,9 +924,11 @@ GBCGameplayProcess::
 .black
     ld a, OCPSF_AUTOINC | (7*8)+(3*2)
     ldh [rOCPS], a
-    xor a, a
+    ld bc, R2 | B0
     wait_vram
+    ld a, c
     ldh [rOCPD], a
+    ld a, b
     ldh [rOCPD], a
     ret
 
diff --git a/src/include/globals.asm b/src/include/globals.asm
index 99b39a3..4fb88e8 100644
--- a/src/include/globals.asm
+++ b/src/include/globals.asm
@@ -119,6 +119,9 @@ DEF SCORE_BASE_Y        EQU 115
 DEF LEVEL_BASE_X        EQU 120
 DEF CLEVEL_BASE_Y       EQU 136
 DEF NLEVEL_BASE_Y       EQU 148
+DEF TELLS_BASE_X        EQU 154
+DEF TELLS_BASE_Y        EQU 64
+DEF TELLS_Y_DIST        EQU 10
 
 ; Piece names
 DEF PIECE_I             EQU 0
@@ -153,6 +156,7 @@ DEF TILE_CLEARING       EQU 124
 DEF TILE_GHOST          EQU 125
 DEF TILE_SELECTED       EQU 193
 DEF TILE_UNSELECTED     EQU 194
+DEF TILE_BLANK          EQU 1
 
 ; Button mode.
 DEF BUTTON_MODE_NORM    EQU 0
@@ -185,6 +189,7 @@ DEF DROP_MODE_NONE      EQU 4
 DEF DROP_MODE_COUNT     EQU 5
 
 ; Speed curve selection.
+DEF SCURVE_ENTRY_SIZE   EQU 13
 DEF SCURVE_DMGT         EQU 0
 DEF SCURVE_TGM1         EQU 1
 DEF SCURVE_TGM3         EQU 2
diff --git a/src/level.asm b/src/level.asm
index 23d7c7c..54aa2dc 100644
--- a/src/level.asm
+++ b/src/level.asm
@@ -25,6 +25,7 @@ INCLUDE "globals.asm"
 SECTION "High Level Variables", HRAM
 hCurrentDAS:: ds 1
 hCurrentARE:: ds 1
+hCurrentLineARE:: ds 1
 hCurrentLockDelay:: ds 1
 hCurrentLineClearDelay:: ds 1
 hCurrentIntegerGravity:: ds 1
@@ -336,6 +337,8 @@ DoSpeedUp:
     ld a, [hl+]
     ldh [hCurrentARE], a
     ld a, [hl+]
+    ldh [hCurrentLineARE], a
+    ld a, [hl+]
     ldh [hCurrentDAS], a
     ld a, [hl+]
     ldh [hCurrentLockDelay], a
diff --git a/src/res/sources/tiles.gbr b/src/res/sources/tiles.gbr
index d1625a9a1490d5db5c0eeef4c77e9977ea9d112c..aca7510715357bfb1a372e45da5e94e704e121da 100644
GIT binary patch
delta 30
mcmaF3f$8A}rVR%a7#TMoRCwyg$T<0-o9gB>`I9x60=NLvpA2RI

delta 28
kcmaF3f$8A}rVR%a7@0O7RCww)`GK3-<}>+|HJBI}0K@7G3jhEB

diff --git a/src/res/tiles.inc b/src/res/tiles.inc
index 7e10909..c5b4202 100644
--- a/src/res/tiles.inc
+++ b/src/res/tiles.inc
@@ -270,7 +270,7 @@ Tiles::
     DB $24,$3C,$24,$3C,$18,$18,$00,$00
     DB $FF,$FF,$AA,$FF,$00,$FF,$AA,$55
     DB $00,$FF,$55,$FF,$FF,$FF,$00,$00
-    DB $DB,$E7,$A5,$C3,$42,$81,$81,$00
+    DB $DB,$E7,$A5,$C3,$42,$81,$91,$00
     DB $42,$81,$A5,$C3,$DB,$E7,$00,$00
     DB $44,$44,$FE,$FE,$44,$44,$44,$44
     DB $44,$44,$FE,$FE,$44,$44,$00,$00
diff --git a/src/sprites.asm b/src/sprites.asm
index 254d169..4e2de8b 100644
--- a/src/sprites.asm
+++ b/src/sprites.asm
@@ -30,25 +30,42 @@ wSPRNext1:: ds 4
 wSPRNext2:: ds 4
 wSPRNext3:: ds 4
 wSPRNext4:: ds 4
+wUnused0:: ds 4
+wUnused1:: ds 4
 wSPRHold1:: ds 4
 wSPRHold2:: ds 4
 wSPRHold3:: ds 4
 wSPRHold4:: ds 4
+wUnused2:: ds 4
+wUnused3:: ds 4
 wSPRScore1:: ds 4
 wSPRScore2:: ds 4
 wSPRScore3:: ds 4
 wSPRScore4:: ds 4
 wSPRScore5:: ds 4
 wSPRScore6:: ds 4
+wUnused4:: ds 4
+wUnused5:: ds 4
 wSPRCLevel1:: ds 4
 wSPRCLevel2:: ds 4
 wSPRCLevel3:: ds 4
 wSPRCLevel4:: ds 4
+wUnused6:: ds 4
+wUnused7:: ds 4
 wSPRNLevel1:: ds 4
 wSPRNLevel2:: ds 4
 wSPRNLevel3:: ds 4
 wSPRNLevel4:: ds 4
-wSPRUnused:: ds (16 * 4)
+wUnused8:: ds 4
+wUnused9:: ds 4
+wUnusedA:: ds 4
+wUnusedB:: ds 4
+wUnusedC:: ds 4
+wUnusedD:: ds 4
+wSPRModeRNG:: ds 4
+wSPRModeRot:: ds 4
+wSPRModeDrop:: ds 4
+wSPRModeHiG:: ds 4
 ENDU
 
 
@@ -95,6 +112,49 @@ ClearOAM::
 
 
 SECTION "Domain Specific Functions", ROM0
+ApplyTells::
+    ld a, TELLS_BASE_Y
+    ld [wSPRModeRNG], a
+    add a, TELLS_Y_DIST
+    ld [wSPRModeRot], a
+    add a, TELLS_Y_DIST
+    ld [wSPRModeDrop], a
+    add a, TELLS_Y_DIST
+    ld [wSPRModeHiG], a
+
+    ld a, TELLS_BASE_X
+    ld [wSPRModeRNG+1], a
+    ld [wSPRModeRot+1], a
+    ld [wSPRModeDrop+1], a
+    ld [wSPRModeHiG+1], a
+
+    ld a, [wRNGModeState]
+    add a, TILE_RNG_MODE_BASE
+    ld [wSPRModeRNG+2], a
+
+    ld a, [wRotModeState]
+    add a, TILE_ROT_MODE_BASE
+    ld [wSPRModeRot+2], a
+
+    ld a, [wDropModeState]
+    add a, TILE_DROP_MODE_BASE
+    ld [wSPRModeDrop+2], a
+
+    ld a, [wAlways20GState]
+    add a, TILE_HIG_MODE_BASE
+    ld [wSPRModeHiG+2], a
+
+    ld a, 1
+    ld [wSPRModeRNG+3], a
+    ld a, 3
+    ld [wSPRModeRot+3], a
+    ld a, 4
+    ld [wSPRModeDrop+3], a
+    ld a, 0
+    ld [wSPRModeHiG+3], a
+    ret
+
+
 ; Index of next piece in A.
 ApplyNext::
     ; Correct color
@@ -105,11 +165,13 @@ ApplyNext::
 
     ; Correct tile
     add a, TILE_PIECE_0
+    add a, 7
     ld [wSPRNext1+2], a
     ld [wSPRNext2+2], a
     ld [wSPRNext3+2], a
     ld [wSPRNext4+2], a
     sub a, TILE_PIECE_0
+    sub a, 7
 
     ; X positions
     ld hl, sPieceXOffsets
@@ -176,6 +238,28 @@ ApplyHold::
     ld [wSPRHold4+3], a
 
     ; Correct tile
+    ld b, a
+    ld a, [wInitialA]
+    cp a, $11
+    ld a, b
+    jr z, .show
+    ldh a, [hEvenFrame]
+    cp a, 0
+    ld a, b
+    jr z, .show
+
+
+.hide
+    ld b, a
+    ld a, TILE_BLANK
+    ld [wSPRHold1+2], a
+    ld [wSPRHold2+2], a
+    ld [wSPRHold3+2], a
+    ld [wSPRHold4+2], a
+    ld a, b
+    jr .x
+
+.show
     add a, TILE_PIECE_0
     ld [wSPRHold1+2], a
     ld [wSPRHold2+2], a
@@ -184,6 +268,7 @@ ApplyHold::
     sub a, TILE_PIECE_0
 
     ; X positions
+.x
     ld hl, sPieceXOffsets
     ld de, sPieceYOffsets
     cp 0
diff --git a/src/sram.asm b/src/sram.asm
index d3e5c4f..f481b29 100644
--- a/src/sram.asm
+++ b/src/sram.asm
@@ -23,7 +23,6 @@ INCLUDE "globals.asm"
 
 
 SECTION "Persistent Globals", SRAM
-rMagic:: ds 4
 rCheck:: ds 6
 rSwapABState:: ds 1
 rRNGModeState:: ds 1
@@ -35,16 +34,61 @@ rSelectedStartLevel:: ds 2
 
 
 SECTION "SRAM Functions", ROM0
+RestoreSRAM::
+    ; Check if our SRAM is initialized and of the correct version.
+    ld a, [rCheck]
+    cp a, LOW(__UTC_YEAR__)
+    jr nz, InitializeSRAM
+    ld a, [rCheck+1]
+    cp a, __UTC_MONTH__
+    jr nz, InitializeSRAM
+    ld a, [rCheck+2]
+    cp a, __UTC_DAY__
+    jr nz, InitializeSRAM
+    ld a, [rCheck+3]
+    cp a, __UTC_HOUR__
+    jr nz, InitializeSRAM
+    ld a, [rCheck+4]
+    cp a, __UTC_MINUTE__
+    jr nz, InitializeSRAM
+    ld a, [rCheck+5]
+    cp a, __UTC_SECOND__
+    jr nz, InitializeSRAM
+
+    ; SRAM is initialized and for this build, so we can load the data.
+    ld a, [rSwapABState]
+    ld [wSwapABState], a
+    ld a, [rRNGModeState]
+    ld [wRNGModeState], a
+    ld a, [rRotModeState]
+    ld [wRotModeState], a
+    ld a, [rDropModeState]
+    ld [wDropModeState], a
+    ld a, [rSpeedCurveState]
+    ld [wSpeedCurveState], a
+    ld a, [rAlways20GState]
+    ld [wAlways20GState], a
+
+    ld a, [rSelectedStartLevel]
+    ldh [hStartSpeed], a
+    ld a, [rSelectedStartLevel+1]
+    ldh [hStartSpeed+1], a
+    ret
+
 InitializeSRAM:
     ; Set the magic id.
-    ld a, SAVE_MAGIC_0
-    ld [rMagic], a
-    ld a, SAVE_MAGIC_1
-    ld [rMagic+1], a
-    ld a, SAVE_MAGIC_2
-    ld [rMagic+2], a
-    ld a, SAVE_MAGIC_3
-    ld [rMagic+3], a
+    ld a, LOW(__UTC_YEAR__)
+    ld [rCheck], a
+    ld a, __UTC_MONTH__
+    ld [rCheck+1], a
+    ld a, __UTC_DAY__
+    ld [rCheck+2], a
+    ld a, __UTC_HOUR__
+    ld [rCheck+3], a
+    ld a, __UTC_MINUTE__
+    ld [rCheck+4], a
+    ld a, __UTC_SECOND__
+    ld [rCheck+5], a
 
     ; Load defaults.
     ld a, BUTTON_MODE_NORM
@@ -70,26 +114,9 @@ InitializeSRAM:
     ld a, HIG_MODE_OFF
     ld [rAlways20GState], a
     ld [wAlways20GState], a
-    ; Falls through to the next label!
-
-
-PartiallyInitializeSRAM:
-    ; Save build data.
-    ld a, LOW(__UTC_YEAR__)
-    ld [rCheck], a
-    ld a, __UTC_MONTH__
-    ld [rCheck+1], a
-    ld a, __UTC_DAY__
-    ld [rCheck+2], a
-    ld a, __UTC_HOUR__
-    ld [rCheck+3], a
-    ld a, __UTC_MINUTE__
-    ld [rCheck+4], a
-    ld a, __UTC_SECOND__
-    ld [rCheck+5], a
 
     ; Set to the default start level.
-    ld hl, sSpeedCurve
+    ld hl, sDMGTSpeedCurve
     ld a, l
     ldh [hStartSpeed], a
     ld [rSelectedStartLevel], a
@@ -98,63 +125,4 @@ PartiallyInitializeSRAM:
     ld [rSelectedStartLevel+1], a
     ret
 
-
-RestoreSRAM::
-    ; Check if our SRAM is initialized at all.
-    ; If not, we load all the defaults.
-    ld a, [rMagic]
-    cp a, SAVE_MAGIC_0
-    jr nz, InitializeSRAM
-    ld a, [rMagic+1]
-    cp a, SAVE_MAGIC_1
-    jr nz, InitializeSRAM
-    ld a, [rMagic+2]
-    cp a, SAVE_MAGIC_2
-    jp nz, InitializeSRAM
-    ld a, [rMagic+3]
-    cp a, SAVE_MAGIC_3
-    jp nz, InitializeSRAM
-
-    ; If SRAM is initialized, we still need to check if it's for this exact build.
-    ; If not, wipe data that is no longer valid.
-    ld a, [rCheck]
-    cp a, LOW(__UTC_YEAR__)
-    jr nz, PartiallyInitializeSRAM
-    ld a, [rCheck+1]
-    cp a, __UTC_MONTH__
-    jr nz, PartiallyInitializeSRAM
-    ld a, [rCheck+2]
-    cp a, __UTC_DAY__
-    jr nz, PartiallyInitializeSRAM
-    ld a, [rCheck+3]
-    cp a, __UTC_HOUR__
-    jr nz, PartiallyInitializeSRAM
-    ld a, [rCheck+4]
-    cp a, __UTC_MINUTE__
-    jr nz, PartiallyInitializeSRAM
-    ld a, [rCheck+5]
-    cp a, __UTC_SECOND__
-    jr nz, PartiallyInitializeSRAM
-
-    ; SRAM is initialized and for this build, so we can load the data.
-    ld a, [rSwapABState]
-    ld [wSwapABState], a
-    ld a, [rRNGModeState]
-    ld [wRNGModeState], a
-    ld a, [rRotModeState]
-    ld [wRotModeState], a
-    ld a, [rDropModeState]
-    ld [wDropModeState], a
-    ld a, [rSpeedCurveState]
-    ld [wSpeedCurveState], a
-    ld a, [rAlways20GState]
-    ld [wAlways20GState], a
-
-    ld a, [rSelectedStartLevel]
-    ldh [hStartSpeed], a
-    ld a, [rSelectedStartLevel+1]
-    ldh [hStartSpeed+1], a
-    ret
-
-
 ENDC
diff --git a/src/state_gameplay.asm b/src/state_gameplay.asm
index b1bc142..397927f 100644
--- a/src/state_gameplay.asm
+++ b/src/state_gameplay.asm
@@ -63,27 +63,10 @@ SwitchToGameplay::
     ld bc, GameplayTilemapEnd - GameplayTilemap
     call UnsafeMemCopy
 
-    ; Place a tell on the screen for modes.
-    ld hl, FIELD_RNG
-    ld a, [wRNGModeState]
-    add a, TILE_RNG_MODE_BASE
-    ld [hl], a
-    ld hl, FIELD_ROT
-    ld a, [wRotModeState]
-    add a, TILE_ROT_MODE_BASE
-    ld [hl], a
-    ld hl, FIELD_DROP
-    ld a, [wDropModeState]
-    add a, TILE_DROP_MODE_BASE
-    ld [hl], a
-    ld hl, FIELD_HIG
-    ld a, [wAlways20GState]
-    add a, TILE_HIG_MODE_BASE
-    ld [hl], a
-
     ; Clear OAM.
     call ClearOAM
     call SetNumberSpritePositions
+    call ApplyTells
 
     ; Set up the palettes.
     ld a, PALETTE_REGULAR
@@ -473,6 +456,32 @@ preGameOverMode:
     ld [hl+], a
 .skip7\@
     ENDR
+
+    ; Place a tell on the screen for modes.
+    ld hl, FIELD_RNG
+    wait_vram
+    ld a, [wRNGModeState]
+    add a, TILE_RNG_MODE_BASE
+    ld [hl], a
+
+    ld hl, FIELD_ROT
+    wait_vram
+    ld a, [wRotModeState]
+    add a, TILE_ROT_MODE_BASE
+    ld [hl], a
+
+    ld hl, FIELD_DROP
+    wait_vram
+    ld a, [wDropModeState]
+    add a, TILE_DROP_MODE_BASE
+    ld [hl], a
+
+    ld hl, FIELD_HIG
+    wait_vram
+    ld a, [wAlways20GState]
+    add a, TILE_HIG_MODE_BASE
+    ld [hl], a
+
     ld a, MODE_GAME_OVER
     ldh [hMode], a
 
diff --git a/src/state_title.asm b/src/state_title.asm
index 0dc5cf9..7fd6bd2 100644
--- a/src/state_title.asm
+++ b/src/state_title.asm
@@ -313,7 +313,7 @@ DecrementLevel:
     ld l, a
     ldh a, [hStartSpeed+1]
     ld h, a
-    ld bc, -12
+    ld bc, -SCURVE_ENTRY_SIZE
     add hl, bc
     ld a, l
     ldh [hStartSpeed], a
@@ -428,7 +428,7 @@ IncrementLevel:
     ld l, a
     ldh a, [hStartSpeed+1]
     ld h, a
-    ld bc, 12
+    ld bc, SCURVE_ENTRY_SIZE
     add hl, bc
     ld a, l
     ldh [hStartSpeed], a
@@ -457,7 +457,7 @@ GetEnd:
     ld a, [wSpeedCurveState]
     cp a, SCURVE_DMGT
     jr nz, :+
-    ld bc, sSpeedCurveEnd
+    ld bc, sDMGTSpeedCurveEnd
     ret
 :   cp a, SCURVE_TGM1
     jr nz, :+
@@ -482,7 +482,7 @@ GetStart:
     ld a, [wSpeedCurveState]
     cp a, SCURVE_DMGT
     jr nz, :+
-    ld hl, sSpeedCurve
+    ld hl, sDMGTSpeedCurve
     ret
 :   cp a, SCURVE_TGM1
     jr nz, :+
@@ -521,7 +521,7 @@ CheckLevelRange:
     ldh [hStartSpeed+1], a
 
 .notatend
-    ld de, -12
+    ld de, -SCURVE_ENTRY_SIZE
 
     call GetStart
     add hl, de