From f7986f73b2d48a1247d14dc6c1213d1cb425794e Mon Sep 17 00:00:00 2001
From: Randy Thiemann <randy.thiemann@student.pxl.be>
Date: Fri, 10 Nov 2023 22:55:52 +0100
Subject: [PATCH] Finesse on the game over screen.

---
 bin/DMGTRIS.GBC        | Bin 131072 -> 131072 bytes
 bin/DMGTRIS.map        | 191 +++++++++++++++++++++--------------------
 bin/DMGTRIS.pocket     | Bin 131072 -> 131072 bytes
 bin/DMGTRIS.sym        | 161 +++++++++++++++++-----------------
 src/state_gameplay.asm |  57 +++++++++---
 5 files changed, 224 insertions(+), 185 deletions(-)

diff --git a/bin/DMGTRIS.GBC b/bin/DMGTRIS.GBC
index 054fc69155541af7d738675d75ee18fc9e3bfb0a..e397c29c765f2b43b7868e629b9ddb8a126cc3d6 100644
GIT binary patch
delta 1547
zcma)*T})eL7{|}kt)(pmJY_%`vi0y~!zNu8r!eVR*%lLE5fZ7(OdIIO=^&{ZW4v>t
z6?U^m6T`yk%@Sjn@xob?nw>elm?8#D-xH&Ap=B4ZOElUWj~n>Wi{f(*6;B;TuipQ8
zpXdF*|8t(-iO0?HxcP&p!7zC~GYaf(2xUS>`|jG1++V8dHSkO!Bo{+-uUQWKbL-=s
zw%Qyk%I`namB3k3thC7VSnq;+LguZ7puD%Oz8I7}sGRGT;smM*+4((tbD3j4hen2P
zz-P5_?wHL}S8n{I+?Yw)+716<G@Sh(MsrEqsmv>Nx6L+glJ!hFOx&Qr3YpUmCsgjt
zG=FG?@LX@l4G3rMcXV58f>G`#0__Z0dxD*v>2^!qZgAUezX+CdH2x}0a0x+5CcqEU
zr^g`)jw4}9e_<avPfs`+iu*~)<f=6>Bixfx<Rs*b5RmvGr~+J{8ioz?L&+$|q~I+B
z+B<CQfhjRQ4}B02FO0z>xLh5BK6WX%*cT#yJf`GJqfUFe5D*WF(BdBmb3H3yRg*1V
z+Nyh;M&3koX_{w;E2_MO<_Pa4Ed$C|^c!;h5Zd7(ev{tejr113i+-D?x9O_#TZwTQ
z$&&bj51xlh;vFA!O`|z~5-Z?zD66GSmtA*+EQNR*%_$d3%xCClr#ZA$e#PEeGU!!u
zbd7J(_K0Ojc|&U|24pm;Dt2j$noLcy4`Ubnhyu-P!3yJYu>(7tyqHNrV^eE{yR{4v
z^=<hEJo0jon7!;d>HTM6$=X>Qmoa#Qvaa2rY-mdwJ=8Son5La{GU7{PP`@W2^9;@L
zquM>#37A`)U4XVzKCiN-e!P41J|1IzVeai^aA}iA{iROd)9Jk{fA<{U)*>5%#zTI2
zgiAy$V*&2wvSn*jMZf%owe+>iQhr&-L7a>F5%|qQKsp_Q*ITc}VH&DeCjTPrjC3&p
zKN^~AqC28hAC;1`u%@zg_99dxTOzV`RJxjkMQdH(lpe60I6V(XvE#<P#@Ah>jeRGw
z*djc@SD-n{UCEaDifz?(e6?3pHNFPDWI)eXOwjn+^&nrD1@T261Z{>BDha#;=NS{(
z6m&sM>`lSLw#&jcRWWfQ1x-gV!Qm}}V!{pt;az%y)T?p&;(IA*ZQ6)(<5?X#-4PWX
zpF~qIRPEHG6B9IaVuFSaJ|Q|{&jRd!Tt^Ki>14=e4|(P=sqZ2`d&#lZG+ixJv}j<(
z#F+(fPsarI(I_{NEpvi;N~hn{>5p{!JDs)=*rWaD7%A_edFPOcL6AncGiOz}hO_?$
TR~!C>)i{-H!1}MiyU+azB%rXh

delta 1516
zcma)*ZD?Cn7{~9EHEC{|HQsbxZ`WnLw{M0z8yUW|W4TMWDKr&#!Bj=lHcfN0R?s0s
z82FOJxi1Y0Qs~V$i*#VY8X@A<sW7cdD>*@Q8%??o$AO~x;&p4C224EnCeB-1&`;-o
zp65CL^PF>jCmy%P<JR{c0n-aJ84;K|7|Vps&br32+>vs9ze%8qW4Y4U>?`zL{|<e;
zQ>cSoRe%4{Q3h^zX{$x1&vqR=!JJ?#j^_4tG?hkkUZS`Sx)dZTnB#t6F0Js?7qFKS
zn#o)%oIPsyI%<WV)Cx06d#C9?jE1xS!)P{Xe>n5J<Eqteo?`eZ*23Q{F+-WhSq`>F
z&b7X8gYayB*F^|tZg%zBc0U;9e@4(rq4futsdK#^rPl)<r~QgVzl7s2;sh^AN-_aK
zP(C{bNnl$i=_ADh=w*DIZ7#K=vc=tKp-%GcO5_CO%@9%qKhy&m9~y>D>m8?~Je7iZ
z6R~IQjAL4k&%pqM<nsZzlMG7%7+@ABmR(`=$GvKyEOO3tF(e<9p)J@w$@i^-P3vs=
zY&GxY%z_2y)40HRwqykw=aJw;ZG-AJ_&fCBJ;aVI5-RwbV8)k)UHD2GU&U+ctuo~{
zqec1I5qJj9%GXAqCq~SL6C?v1tFDzRZl_@hS_}(zoLA46sn3a@6X%Jo`WvZjL_<C`
zkJp7ZJ%(t%`nq0J3gw7NeW^zuw9d3n4v@Bs;{*j<Ak#G7z?-EmQo#vwCIx$2Ai`f>
zfrxfmp_wc>Gl8r=W<q)QG5FF(s~cq-*NM6*`MCfz?Fr=s3g-n;_fj{@Hqx6szW^Pv
z5uduQUC<4DlWfBbO!9B7fLniEqQ5ri8wR~^^`Dw!2K{tRvrnl7FD`Ha3soA=o#dqm
z9T?>=t<cryA+fJ)<!{||v8j4O_8@r-?c_qG7*fuJ;WgLneE<Fr;t+#|rK!Ks@+vb4
z_{r4ztF$9iw+MN!!ny|4sTpV>P{{<U!^%<;mTeB#w2`b&<=7k?CKVUwbg-@y%$S+T
zawW12tkFLu{zA3}mMH0Y16cJ@V^#-i$cF}vV2P3r)~@YfB_#Ru2u#>b$29~5mOP{=
zGb!i+QSMK{etSZ?jgu&cQqXcA>EKWm9Z}i=9kQ1Z9Z}NJk>5#yt0f=h$Fl}zdLtS$
z0}4)ozoAZJM)og2`~3!7$Zp*fs`Q~p522<W^otK2b*1rIaZ8C#lqkQs0G^mAF-(*n
z%+>%QdfK4hFzAmA`g?<>5$w@Fu_#q3^4BQxp3*29&TgZq22lt3VGZQwZ-ey21$g^O
H4Wz#S^HG=9

diff --git a/bin/DMGTRIS.map b/bin/DMGTRIS.map
index d1f5bd6..3d38100 100644
--- a/bin/DMGTRIS.map
+++ b/bin/DMGTRIS.map
@@ -1204,7 +1204,7 @@ ROMX bank #5:
 	         $540f = ClearLines.r_u48
 	         $540f = ClearLines.fixgarbo
 	         $5412 = ClearLines.fixgarboloop
-	SECTION: $541c-$6318 ($0efd bytes) ["Gameplay Function Banked"]
+	SECTION: $541c-$6334 ($0f19 bytes) ["Gameplay Function Banked"]
 	         $541c = SwitchToGameplayB
 	         $5422 = SwitchToGameplayB.wvr_u1
 	         $542b = SwitchToGameplayB.loadtilemap
@@ -1668,46 +1668,47 @@ ROMX bank #5:
 	         $616c = GamePlayEventLoopHandlerB.notempty7_u213
 	         $616f = GamePlayEventLoopHandlerB.skip7_u213
 	         $6173 = GamePlayEventLoopHandlerB.gameOverMode
-	         $619c = GamePlayEventLoopHandlerB.noretry
-	         $61a9 = GamePlayEventLoopHandlerB.pauseMode
-	         $61be = GamePlayEventLoopHandlerB.noqr
-	         $61d3 = GamePlayEventLoopHandlerB.nounpause
-	         $621d = GamePlayEventLoopHandlerB.preRollMode
-	         $624c = GamePlayEventLoopHandlerB.predone
-	         $6262 = GamePlayEventLoopHandlerB.staysmall
-	         $6278 = GamePlayEventLoopHandlerB.drawStaticInfo
-	         $62a9 = DoHold
-	         $62ad = DoHold.checkIRSA
-	         $62b4 = DoHold.ldb3
-	         $62c0 = DoHold.lda3
-	         $62ca = DoHold.cp3
-	         $62d8 = DoHold.checkIRSB
-	         $62df = DoHold.lda4
-	         $62eb = DoHold.ldb4
-	         $62f5 = DoHold.cp4
-	         $6303 = DoHold.noRotation
-	         $630e = DoHold.doHoldOperation
-	SECTION: $6319-$6bae ($0896 bytes) ["Gameplay Static Data"]
-	         $6319 = sLeftDasSlam
-	         $631f = sRightDasSlam
-	         $6325 = sLeady
-	         $632f = sGo
-	         $6339 = sPause
-	         $6361 = sKill
-	         $6401 = sYouAreGM
-	         $6465 = sFinalChallenge
-	         $652d = sPieceXOffsets
-	         $6549 = sPieceYOffsets
-	         $6565 = sPieceFastRotationStates
-	         $65d5 = sPieceRotationStates
-	         $6645 = sTGM3Bag
-	         $6668 = sTGM3Droughts
-	         $666f = sGameplayTileMap
-	         $690f = sGameplayUngradedTileMap
-	         $690f = sGameplayTileMapEnd
-	         $6baf = sGameplayUngradedTileMapEnd
-	EMPTY: $6baf-$7fff ($1451 bytes)
-	TOTAL EMPTY: $1451 bytes
+	         $618f = GamePlayEventLoopHandlerB.checkretry
+	         $61b8 = GamePlayEventLoopHandlerB.noretry
+	         $61c5 = GamePlayEventLoopHandlerB.pauseMode
+	         $61da = GamePlayEventLoopHandlerB.noqr
+	         $61ef = GamePlayEventLoopHandlerB.nounpause
+	         $6239 = GamePlayEventLoopHandlerB.preRollMode
+	         $6268 = GamePlayEventLoopHandlerB.predone
+	         $627e = GamePlayEventLoopHandlerB.staysmall
+	         $6294 = GamePlayEventLoopHandlerB.drawStaticInfo
+	         $62c5 = DoHold
+	         $62c9 = DoHold.checkIRSA
+	         $62d0 = DoHold.ldb3
+	         $62dc = DoHold.lda3
+	         $62e6 = DoHold.cp3
+	         $62f4 = DoHold.checkIRSB
+	         $62fb = DoHold.lda4
+	         $6307 = DoHold.ldb4
+	         $6311 = DoHold.cp4
+	         $631f = DoHold.noRotation
+	         $632a = DoHold.doHoldOperation
+	SECTION: $6335-$6bca ($0896 bytes) ["Gameplay Static Data"]
+	         $6335 = sLeftDasSlam
+	         $633b = sRightDasSlam
+	         $6341 = sLeady
+	         $634b = sGo
+	         $6355 = sPause
+	         $637d = sKill
+	         $641d = sYouAreGM
+	         $6481 = sFinalChallenge
+	         $6549 = sPieceXOffsets
+	         $6565 = sPieceYOffsets
+	         $6581 = sPieceFastRotationStates
+	         $65f1 = sPieceRotationStates
+	         $6661 = sTGM3Bag
+	         $6684 = sTGM3Droughts
+	         $668b = sGameplayTileMap
+	         $692b = sGameplayUngradedTileMap
+	         $692b = sGameplayTileMapEnd
+	         $6bcb = sGameplayUngradedTileMapEnd
+	EMPTY: $6bcb-$7fff ($1435 bytes)
+	TOTAL EMPTY: $1435 bytes
 
 ROMX bank #6:
 	SECTION: $4000-$4007 ($0008 bytes) ["Bank ID BANK_GAMEPLAY_BIG"]
@@ -2010,7 +2011,7 @@ ROMX bank #6:
 	         $52e0 = BigClearLines.fixgarbo
 	         $52e3 = BigClearLines.fixgarboloop
 	         $5301 = BigWidenField
-	SECTION: $5651-$65f0 ($0fa0 bytes) ["Gameplay Function Big Banked"]
+	SECTION: $5651-$660c ($0fbc bytes) ["Gameplay Function Big Banked"]
 	         $5651 = SwitchToGameplayBigB
 	         $5657 = SwitchToGameplayBigB.wvr_u214
 	         $5660 = SwitchToGameplayBigB.loadtilemap
@@ -2494,44 +2495,45 @@ ROMX bank #6:
 	         $6423 = GamePlayBigEventLoopHandlerB.notempty7_u436
 	         $6426 = GamePlayBigEventLoopHandlerB.skip7_u436
 	         $642a = GamePlayBigEventLoopHandlerB.gameOverMode
-	         $645a = GamePlayBigEventLoopHandlerB.gosmall
-	         $647d = GamePlayBigEventLoopHandlerB.noretry
-	         $648a = GamePlayBigEventLoopHandlerB.pauseMode
-	         $649f = GamePlayBigEventLoopHandlerB.noqr
-	         $64b4 = GamePlayBigEventLoopHandlerB.nounpause
-	         $64ff = GamePlayBigEventLoopHandlerB.preRollMode
-	         $652e = GamePlayBigEventLoopHandlerB.predone
-	         $6550 = GamePlayBigEventLoopHandlerB.drawStaticInfo
-	         $6581 = BigDoHold
-	         $6585 = BigDoHold.checkIRSA
-	         $658c = BigDoHold.ldb3
-	         $6598 = BigDoHold.lda3
-	         $65a2 = BigDoHold.cp3
-	         $65b0 = BigDoHold.checkIRSB
-	         $65b7 = BigDoHold.lda4
-	         $65c3 = BigDoHold.ldb4
-	         $65cd = BigDoHold.cp4
-	         $65db = BigDoHold.noRotation
-	         $65e6 = BigDoHold.doHoldOperation
-	SECTION: $65f1-$6e5c ($086c bytes) ["Gameplay Big Static Data"]
-	         $65f1 = sBigLeftDasSlam
-	         $65f7 = sBigRightDasSlam
-	         $65fd = sBigLeady
-	         $6607 = sBigGo
-	         $6611 = sBigPause
-	         $6639 = sBigKill
-	         $66d9 = sBigYouAreGM
-	         $673d = sBigFinalChallenge
-	         $6805 = sBigPieceXOffsets
-	         $6821 = sBigPieceYOffsets
-	         $683d = sBigPieceFastRotationStates
-	         $68ad = sBigPieceRotationStates
-	         $691d = sBigGameplayTileMap
-	         $6bbd = sBigGameplayUngradedTileMap
-	         $6bbd = sBigGameplayTileMapEnd
-	         $6e5d = sBigGameplayUngradedTileMapEnd
-	EMPTY: $6e5d-$7fff ($11a3 bytes)
-	TOTAL EMPTY: $11a3 bytes
+	         $6446 = GamePlayBigEventLoopHandlerB.checkretry
+	         $6476 = GamePlayBigEventLoopHandlerB.gosmall
+	         $6499 = GamePlayBigEventLoopHandlerB.noretry
+	         $64a6 = GamePlayBigEventLoopHandlerB.pauseMode
+	         $64bb = GamePlayBigEventLoopHandlerB.noqr
+	         $64d0 = GamePlayBigEventLoopHandlerB.nounpause
+	         $651b = GamePlayBigEventLoopHandlerB.preRollMode
+	         $654a = GamePlayBigEventLoopHandlerB.predone
+	         $656c = GamePlayBigEventLoopHandlerB.drawStaticInfo
+	         $659d = BigDoHold
+	         $65a1 = BigDoHold.checkIRSA
+	         $65a8 = BigDoHold.ldb3
+	         $65b4 = BigDoHold.lda3
+	         $65be = BigDoHold.cp3
+	         $65cc = BigDoHold.checkIRSB
+	         $65d3 = BigDoHold.lda4
+	         $65df = BigDoHold.ldb4
+	         $65e9 = BigDoHold.cp4
+	         $65f7 = BigDoHold.noRotation
+	         $6602 = BigDoHold.doHoldOperation
+	SECTION: $660d-$6e78 ($086c bytes) ["Gameplay Big Static Data"]
+	         $660d = sBigLeftDasSlam
+	         $6613 = sBigRightDasSlam
+	         $6619 = sBigLeady
+	         $6623 = sBigGo
+	         $662d = sBigPause
+	         $6655 = sBigKill
+	         $66f5 = sBigYouAreGM
+	         $6759 = sBigFinalChallenge
+	         $6821 = sBigPieceXOffsets
+	         $683d = sBigPieceYOffsets
+	         $6859 = sBigPieceFastRotationStates
+	         $68c9 = sBigPieceRotationStates
+	         $6939 = sBigGameplayTileMap
+	         $6bd9 = sBigGameplayUngradedTileMap
+	         $6bd9 = sBigGameplayTileMapEnd
+	         $6e79 = sBigGameplayUngradedTileMapEnd
+	EMPTY: $6e79-$7fff ($1187 bytes)
+	TOTAL EMPTY: $1187 bytes
 
 SRAM bank #0:
 	SECTION: $a000-$a60e ($060f bytes) ["Persistent Globals"]
@@ -2794,18 +2796,19 @@ WRAM0 bank #0:
 	         $ce55 = wProfileName
 	SECTION: $ce58-$ce5b ($0004 bytes) ["Banking Variables"]
 	         $ce58 = wBankBackup
-	SECTION: $ce5c-$ce5e ($0003 bytes) ["GBC Variables"]
-	         $ce5c = wOuterReps
-	         $ce5d = wInnerReps
-	         $ce5e = wTitlePal
-	SECTION: $ce5f-$ce61 ($0003 bytes) ["Gameplay Variables"]
-	         $ce5f = wRollLine
-	         $ce60 = wInStaffRoll
-	         $ce61 = wBigModeTransfered
-	SECTION: $ce62-$ce62 ($0001 byte) ["SRAM Variables"]
-	         $ce62 = wTarget
-	EMPTY: $ce63-$cfff ($019d bytes)
-	TOTAL EMPTY: $019d bytes
+	SECTION: $ce5c-$ce5f ($0004 bytes) ["Gameplay Variables"]
+	         $ce5c = wRollLine
+	         $ce5d = wInStaffRoll
+	         $ce5e = wBigModeTransfered
+	         $ce5f = wGameOverIgnoreInput
+	SECTION: $ce60-$ce62 ($0003 bytes) ["GBC Variables"]
+	         $ce60 = wOuterReps
+	         $ce61 = wInnerReps
+	         $ce62 = wTitlePal
+	SECTION: $ce63-$ce63 ($0001 byte) ["SRAM Variables"]
+	         $ce63 = wTarget
+	EMPTY: $ce64-$cfff ($019c bytes)
+	TOTAL EMPTY: $019c bytes
 
 HRAM bank #0:
 	SECTION: $ff80-$ff9a ($001b bytes) ["High Field Variables"]
@@ -2897,7 +2900,7 @@ HRAM bank #0:
 
 SUMMARY:
 	ROM0: 14470 bytes used / 1914 free
-	ROMX: 64070 bytes used / 34234 free in 6 banks
+	ROMX: 64126 bytes used / 34178 free in 6 banks
 	SRAM: 1551 bytes used / 6641 free in 1 bank
-	WRAM0: 3683 bytes used / 413 free
+	WRAM0: 3684 bytes used / 412 free
 	HRAM: 124 bytes used / 3 free
diff --git a/bin/DMGTRIS.pocket b/bin/DMGTRIS.pocket
index 926cff97527007d6f64454862dd9a1c354422703..29ad773937acd43cc6647a078e8199277eb73e33 100644
GIT binary patch
delta 1547
zcma)*T})eL7{|}kt)(pmJY_%`vi0y~!zNu8r!eVR*%lLE5fZ7(OdIIODUei+G2S_8
zh25;t#ISIBv&0x?cHyi^jYp>!Q^bJjdt!7hwCv(_iAH<laRWbkQGCv!;;F;v)%!p1
z^SuA}f6nte@who2H^28J7$zq(qrmQkP$p!w@2w5V{iUj21J4vfaxpajs^!o>w?5u&
ztIe^h{Qg5-37j>>N{dX7^$xfvWZqf`%KO{ui$U3g%DG`FPN15Qo!_%JRygK!Xk_>X
zd{!IhPuM(l<;G9SjhUpa-S8hq!`c5~G@rDc$-Go|%WUJOSkIKh#0?6pkU8scLgmhE
z^ZQl^&-Zp*hj8XzN4K>m80CH<(9V$c$Jn{qZnxC!2Djbzi(olV<1f<$mk^|60{kF-
zdJ>Z0I2N|_7Y>kD=qX1-@gOOgT(u@<gnL|yoQ9kc0unz2Re<Xg!?0<7AQ|PD6ufCb
zdxwoZG%dy#pbrA#g)w*tmuq9t$1Vq#`a<N7N0fYN)M-x_0^(s2TKofHu4fgjYO<wE
z+jWoA$eU;`P4nz<MU}VE9O1pBWkC6genUPyf_8X_-=ep9BfZJ*q2H$IExM-sR$^R6
zvMfI5gJ<EAc-seEGic7A#tJwc%35j5W!D`c%OT!IbIOGh^BMZtX%20bU$M8A40@Fu
zUFTc0Jz^PBUe}t60U1rIie1{GCR39fz}N*pqCoRnu)?@p?7$8uFJ@BE*wh-~ZmvK?
zeOtZ(kGvQpW-ohQdiQBqwsscBWenb+Y-l$qo7$2_4>ipOrfDagjQGMB)b9((JVSH*
zsCEx_0_GOy7NPBo&#SDfAMY-`hsRi7n0splT-xMOf2q@Vb$b8m-#sUHw8(~_@rYj@
z;Sv$cSb)2+V%Z*5(Jy~tEq(2>lwa0y80VsX1b(X!kj{qSwbl>fFay=AQ-2Y5PP&+Y
z9}Uel(OuE1k4nioSXbGaya?6EmWXT}m#!sY$y(Pptp_Y8&Md%j?6|(5@pT7jW8aP}
zwFvj|6=;rfSF&ZkV%v2cU+ooDjjus38PM|;6Ewc|+|So#L44i^L7U-}N&@e|dB#LG
z1zivmdsFbB?Xs{#RZN^nLDMlzaCDoXn6L{$c$c0a^=h2H_)ZF1n>M4|cvgo_cSJ?U
zC(#rPRXg?Q!~_kUn4qD9Pl%4#vj_(t)lq{<IvKLnL!LTH>buC#UUH%}P1gz)EgD!c
zadr{hGckdEILZxV%bcK|*6BBN`XinGPNyvd_G$k)M#_6=-Z^Aq5Tp_A+@uQEaQ5He
SYQvwf8mF=YSpOBc`pln{kg%Nq

delta 1516
zcma)*ZD?Cn7{~9EHEHf`)_Bu(P1j}3?VF*_Muso#Snkqo4w{O)V5*{No2I#0E9j6S
z3{jIf_oYEW0=@ZWkq#_aGl+O~Dom@=N=^{nMw9NtaiD0vc->m30Ta)?iSyPL^wasD
z=XuWmJm;L>iN(yZnEB$PV0dvRBLG_mW0{cAR@XR|J5sLiH}F((ELR#!zDnQo@6g9P
zg*xo3%I`l~%i!Ey+G>&MV{U*ukmH%+Xl`FeQ)x8kA<DTymjXlua?T&v%PSo91?;8x
zW-?a`lSeHcYpw8;T45$(=`{R@(Qx*E7$p;yM=~#1ubC~zDVCeEo49*Lb|~|N-3ePG
z=UU%qAe8Lyx&)!jt*%~X_rnqHX9S%TT7QV0I@jx#d)?r+S+0uo%Q*HDj&q_YC*lwQ
z`Lkn?0DJ2seWZ8*y@HS1n@jDeY;rZ4s8d|K96kYgBLrpM2lYV4lf$rSzUxecqf#($
zAog|(Yn_&2b1(ow>AWBACc}~+2H3@kWk(48alcY13r<_Q7?ci5&=%;P<oZ^DQ9D~c
zTg`i%M&5+;X<T64Te3Wj^N9DNwn60^{2lu6K4M1}@fCcXH{vV&E_^kOui-W2cA0V+
z(W3O+2s{gCrRyWm6D8*S36cS)U0EwvTsGYjv>4(oIIo;9Q=bz*8_pA3<u_8>h=#mM
z9<TFlS`5)X<qfT<6wDEm`cjWJsGX^u93X8M#|a9!K&ENDfj3KCq{7KdnH218fiQPv
z1;XlS`DU_YW&)YL?1cQ@<M1UzD;s6T*@?O->3Kgi?Fr_13g>x2^HMg;4CzgpUx1G2
zh*w!xFX$$|MYdrFCb_p)z@@z|(O>KIO`YDi`cKU<oqndK?N2KO4=y<UCaN@^JH?4%
z+CR!&UZJbcLt<Ys<!@bdv8j4O`$6&;>dE;^F(}W3;B`lGzJLD*F^EFL($wE*dF0tR
z{A6hTRos!O+l0K=U|ogk^ei+Gs3Zc_VR<P5%Z$}AttabKDLMy-NyVi(4XhgkGj=w-
zTnTRjYxGZ%yO6DcC5T#H2UdMVpVhz`@}faKSc0g5wQD<AaZx%m0uvU)aTNjHP99Q_
z*c9}DAoZtUza=i-!AX#UDQJ0sba1GOjv(%U4%thOjv#92Nbjb=(UOmF<5?Xuy<wG^
z0U4*j*HEW2Bl#Af{XrcrWVdb#Rr=6lhfq@w`o)WmI?{NpxTQoRN|4@K0C!XnSvJBA
zW@~^DJ+0Gk>hwoC{k=}p2=-{7SP-ie`Dzq-POB6RXSY#QgQ$c2um*DTcR+gb0=)B-
G3esO@IG4Tv

diff --git a/bin/DMGTRIS.sym b/bin/DMGTRIS.sym
index 8f54d41..bd9da67 100644
--- a/bin/DMGTRIS.sym
+++ b/bin/DMGTRIS.sym
@@ -1414,43 +1414,44 @@
 05:616c GamePlayEventLoopHandlerB.notempty7_u213
 05:616f GamePlayEventLoopHandlerB.skip7_u213
 05:6173 GamePlayEventLoopHandlerB.gameOverMode
-05:619c GamePlayEventLoopHandlerB.noretry
-05:61a9 GamePlayEventLoopHandlerB.pauseMode
-05:61be GamePlayEventLoopHandlerB.noqr
-05:61d3 GamePlayEventLoopHandlerB.nounpause
-05:621d GamePlayEventLoopHandlerB.preRollMode
-05:624c GamePlayEventLoopHandlerB.predone
-05:6262 GamePlayEventLoopHandlerB.staysmall
-05:6278 GamePlayEventLoopHandlerB.drawStaticInfo
-05:62a9 DoHold
-05:62ad DoHold.checkIRSA
-05:62b4 DoHold.ldb3
-05:62c0 DoHold.lda3
-05:62ca DoHold.cp3
-05:62d8 DoHold.checkIRSB
-05:62df DoHold.lda4
-05:62eb DoHold.ldb4
-05:62f5 DoHold.cp4
-05:6303 DoHold.noRotation
-05:630e DoHold.doHoldOperation
-05:6319 sLeftDasSlam
-05:631f sRightDasSlam
-05:6325 sLeady
-05:632f sGo
-05:6339 sPause
-05:6361 sKill
-05:6401 sYouAreGM
-05:6465 sFinalChallenge
-05:652d sPieceXOffsets
-05:6549 sPieceYOffsets
-05:6565 sPieceFastRotationStates
-05:65d5 sPieceRotationStates
-05:6645 sTGM3Bag
-05:6668 sTGM3Droughts
-05:666f sGameplayTileMap
-05:690f sGameplayUngradedTileMap
-05:690f sGameplayTileMapEnd
-05:6baf sGameplayUngradedTileMapEnd
+05:618f GamePlayEventLoopHandlerB.checkretry
+05:61b8 GamePlayEventLoopHandlerB.noretry
+05:61c5 GamePlayEventLoopHandlerB.pauseMode
+05:61da GamePlayEventLoopHandlerB.noqr
+05:61ef GamePlayEventLoopHandlerB.nounpause
+05:6239 GamePlayEventLoopHandlerB.preRollMode
+05:6268 GamePlayEventLoopHandlerB.predone
+05:627e GamePlayEventLoopHandlerB.staysmall
+05:6294 GamePlayEventLoopHandlerB.drawStaticInfo
+05:62c5 DoHold
+05:62c9 DoHold.checkIRSA
+05:62d0 DoHold.ldb3
+05:62dc DoHold.lda3
+05:62e6 DoHold.cp3
+05:62f4 DoHold.checkIRSB
+05:62fb DoHold.lda4
+05:6307 DoHold.ldb4
+05:6311 DoHold.cp4
+05:631f DoHold.noRotation
+05:632a DoHold.doHoldOperation
+05:6335 sLeftDasSlam
+05:633b sRightDasSlam
+05:6341 sLeady
+05:634b sGo
+05:6355 sPause
+05:637d sKill
+05:641d sYouAreGM
+05:6481 sFinalChallenge
+05:6549 sPieceXOffsets
+05:6565 sPieceYOffsets
+05:6581 sPieceFastRotationStates
+05:65f1 sPieceRotationStates
+05:6661 sTGM3Bag
+05:6684 sTGM3Droughts
+05:668b sGameplayTileMap
+05:692b sGameplayUngradedTileMap
+05:692b sGameplayTileMapEnd
+05:6bcb sGameplayUngradedTileMapEnd
 06:4008 BigFieldInit
 06:4049 BigFieldClear
 06:40ef GoSmall
@@ -2181,41 +2182,42 @@
 06:6423 GamePlayBigEventLoopHandlerB.notempty7_u436
 06:6426 GamePlayBigEventLoopHandlerB.skip7_u436
 06:642a GamePlayBigEventLoopHandlerB.gameOverMode
-06:645a GamePlayBigEventLoopHandlerB.gosmall
-06:647d GamePlayBigEventLoopHandlerB.noretry
-06:648a GamePlayBigEventLoopHandlerB.pauseMode
-06:649f GamePlayBigEventLoopHandlerB.noqr
-06:64b4 GamePlayBigEventLoopHandlerB.nounpause
-06:64ff GamePlayBigEventLoopHandlerB.preRollMode
-06:652e GamePlayBigEventLoopHandlerB.predone
-06:6550 GamePlayBigEventLoopHandlerB.drawStaticInfo
-06:6581 BigDoHold
-06:6585 BigDoHold.checkIRSA
-06:658c BigDoHold.ldb3
-06:6598 BigDoHold.lda3
-06:65a2 BigDoHold.cp3
-06:65b0 BigDoHold.checkIRSB
-06:65b7 BigDoHold.lda4
-06:65c3 BigDoHold.ldb4
-06:65cd BigDoHold.cp4
-06:65db BigDoHold.noRotation
-06:65e6 BigDoHold.doHoldOperation
-06:65f1 sBigLeftDasSlam
-06:65f7 sBigRightDasSlam
-06:65fd sBigLeady
-06:6607 sBigGo
-06:6611 sBigPause
-06:6639 sBigKill
-06:66d9 sBigYouAreGM
-06:673d sBigFinalChallenge
-06:6805 sBigPieceXOffsets
-06:6821 sBigPieceYOffsets
-06:683d sBigPieceFastRotationStates
-06:68ad sBigPieceRotationStates
-06:691d sBigGameplayTileMap
-06:6bbd sBigGameplayUngradedTileMap
-06:6bbd sBigGameplayTileMapEnd
-06:6e5d sBigGameplayUngradedTileMapEnd
+06:6446 GamePlayBigEventLoopHandlerB.checkretry
+06:6476 GamePlayBigEventLoopHandlerB.gosmall
+06:6499 GamePlayBigEventLoopHandlerB.noretry
+06:64a6 GamePlayBigEventLoopHandlerB.pauseMode
+06:64bb GamePlayBigEventLoopHandlerB.noqr
+06:64d0 GamePlayBigEventLoopHandlerB.nounpause
+06:651b GamePlayBigEventLoopHandlerB.preRollMode
+06:654a GamePlayBigEventLoopHandlerB.predone
+06:656c GamePlayBigEventLoopHandlerB.drawStaticInfo
+06:659d BigDoHold
+06:65a1 BigDoHold.checkIRSA
+06:65a8 BigDoHold.ldb3
+06:65b4 BigDoHold.lda3
+06:65be BigDoHold.cp3
+06:65cc BigDoHold.checkIRSB
+06:65d3 BigDoHold.lda4
+06:65df BigDoHold.ldb4
+06:65e9 BigDoHold.cp4
+06:65f7 BigDoHold.noRotation
+06:6602 BigDoHold.doHoldOperation
+06:660d sBigLeftDasSlam
+06:6613 sBigRightDasSlam
+06:6619 sBigLeady
+06:6623 sBigGo
+06:662d sBigPause
+06:6655 sBigKill
+06:66f5 sBigYouAreGM
+06:6759 sBigFinalChallenge
+06:6821 sBigPieceXOffsets
+06:683d sBigPieceYOffsets
+06:6859 sBigPieceFastRotationStates
+06:68c9 sBigPieceRotationStates
+06:6939 sBigGameplayTileMap
+06:6bd9 sBigGameplayUngradedTileMap
+06:6bd9 sBigGameplayTileMapEnd
+06:6e79 sBigGameplayUngradedTileMapEnd
 00:a000 rCheck
 00:a006 rLastProfile
 00:a007 rProfileName
@@ -2457,13 +2459,14 @@
 00:ce54 wTitleMode
 00:ce55 wProfileName
 00:ce58 wBankBackup
-00:ce5c wOuterReps
-00:ce5d wInnerReps
-00:ce5e wTitlePal
-00:ce5f wRollLine
-00:ce60 wInStaffRoll
-00:ce61 wBigModeTransfered
-00:ce62 wTarget
+00:ce5c wRollLine
+00:ce5d wInStaffRoll
+00:ce5e wBigModeTransfered
+00:ce5f wGameOverIgnoreInput
+00:ce60 wOuterReps
+00:ce61 wInnerReps
+00:ce62 wTitlePal
+00:ce63 wTarget
 00:ff80 hPieceDataBase
 00:ff82 hPieceDataBaseFast
 00:ff84 hPieceDataOffset
diff --git a/src/state_gameplay.asm b/src/state_gameplay.asm
index 8577216..5918672 100644
--- a/src/state_gameplay.asm
+++ b/src/state_gameplay.asm
@@ -41,6 +41,7 @@ SECTION "Gameplay Variables", WRAM0
 wRollLine: ds 1
 wInStaffRoll:: ds 1
 wBigModeTransfered: ds 1
+wGameOverIgnoreInput: ds 1
 
 
 SECTION "Gameplay Function Trampolines", ROM0
@@ -467,9 +468,8 @@ GamePlayEventLoopHandlerB::
 
 
 .preGameOverMode
-    xor a, a
-    ldh [hAState], a
-    ldh [hBState], a
+    ld a, $FF
+    ld [wGameOverIgnoreInput], a
 
     ; Is it just a regular game over?
     ld a, [wKillScreenActive]
@@ -617,9 +617,26 @@ GamePlayEventLoopHandlerB::
 
 
 .gameOverMode
-    ; Retry?
+    ; Wait for A and B to not be held down.
+    ld a, [wGameOverIgnoreInput]
+    cp a, 0
+    jr z, .checkretry
+
     ldh a, [hAState]
-    cp a, 10 ; 10 frame hold
+    cp a, 0
+    jp nz, .drawStaticInfo
+    ldh a, [hBState]
+    cp a, 0
+    jp nz, .drawStaticInfo
+
+    xor a, a
+    ld [wGameOverIgnoreInput], a
+    jp .drawStaticInfo
+
+    ; Retry?
+.checkretry
+    ldh a, [hAState]
+    cp a, 1
     jr nz, .noretry
     call CheckAndAddHiscore
     call RNGInit
@@ -639,7 +656,7 @@ GamePlayEventLoopHandlerB::
     ; Quit
 .noretry
     ldh a, [hBState]
-    cp a, 10 ; 10 frame hold
+    cp a, 1
     jp nz, .drawStaticInfo
     call CheckAndAddHiscore
     jp SwitchToTitle
@@ -1246,9 +1263,8 @@ GamePlayBigEventLoopHandlerB:
 
 
 .preGameOverMode
-    xor a, a
-    ldh [hAState], a
-    ldh [hBState], a
+    ld a, $FF
+    ld [wGameOverIgnoreInput], a
 
     ; Is it just a regular game over?
     ld a, [wKillScreenActive]
@@ -1397,9 +1413,26 @@ GamePlayBigEventLoopHandlerB:
 
 
 .gameOverMode
-    ; Retry?
+    ; Wait for A and B to not be held down.
+    ld a, [wGameOverIgnoreInput]
+    cp a, 0
+    jr z, .checkretry
+
     ldh a, [hAState]
-    cp a, 10 ; 10 frame hold
+    cp a, 0
+    jp nz, .drawStaticInfo
+    ldh a, [hBState]
+    cp a, 0
+    jp nz, .drawStaticInfo
+
+    xor a, a
+    ld [wGameOverIgnoreInput], a
+    jp .drawStaticInfo
+
+    ; Retry?
+.checkretry
+    ldh a, [hAState]
+    cp a, 1
     jr nz, .noretry
     ld a, [wReturnToSmall]
     cp a, $FF
@@ -1439,7 +1472,7 @@ GamePlayBigEventLoopHandlerB:
     ; Quit
 .noretry
     ldh a, [hBState]
-    cp a, 10 ; 10 frame hold
+    cp a, 1
     jp nz, .drawStaticInfo
     call CheckAndAddHiscore
     jp SwitchToTitle