From 50c7ab130bdae82e6b15b2987787c4057d7ba8c6 Mon Sep 17 00:00:00 2001
From: Randy Thiemann <randy.thiemann@student.pxl.be>
Date: Sat, 21 Oct 2023 21:25:57 +0200
Subject: [PATCH] Cause it was easy enough to add.

---
 DMGTRIS.GB                    | Bin 32768 -> 32768 bytes
 README.md                     |   1 +
 src/include/globals.asm       |   7 +-
 src/main.asm                  |   2 +
 src/res/sources/tiles.gbr     | Bin 39009 -> 39009 bytes
 src/res/sources/title_map.gbm | Bin 4388 -> 4388 bytes
 src/res/tiles.inc             | 130 +-------------------------------
 src/res/title_map.inc         | 136 +++++++++++++++++-----------------
 src/rng.asm                   |  14 +++-
 src/state_title.asm           |  18 ++++-
 10 files changed, 107 insertions(+), 201 deletions(-)

diff --git a/DMGTRIS.GB b/DMGTRIS.GB
index a1ef998f7ddcc4ea0c9178b40f672d837e10ba10..8864c427d7eb0bbda689a6d1c95e3fa8fa41e4e2 100644
GIT binary patch
delta 3366
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

delta 3429
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
GUG;BTm1zY4

diff --git a/README.md b/README.md
index 538dc9b..41ad8a2 100644
--- a/README.md
+++ b/README.md
@@ -23,6 +23,7 @@ Please do not try running it on older emulators such as VBA, since this game use
 - A/B/Start — Start the game
 - Left/Right — Switch A/B rotation direction
 - Up/Down — Select starting level
+- Select — Select amount of times a piece will be rerolled if it was given to you in the previous 4 pieces. TGM2 uses 6 for this value, TGM1 uses 4 for this value. You can set this to 0 (pure RNG except you'll never start with O, S, or Z), to 16 (F. Basically never get duplicates.)
 
 ### Gameplay
 - A — Rotate 1
diff --git a/src/include/globals.asm b/src/include/globals.asm
index cb256e0..33af7e4 100644
--- a/src/include/globals.asm
+++ b/src/include/globals.asm
@@ -108,9 +108,10 @@ DEF PALETTE_LIGHTER_0   EQU %11100100
 DEF PALETTE_LIGHTER_1   EQU %10010000
 DEF PALETTE_LIGHTER_2   EQU %01000000
 DEF PALETTE_LIGHTER_3   EQU %00000000
-DEF TITLE_A             EQU $99ED
-DEF TITLE_B             EQU $99EF
-DEF TITLE_LEVEL         EQU $998C
+DEF TITLE_A             EQU $99CD
+DEF TITLE_B             EQU $99CF
+DEF TITLE_LEVEL         EQU $996C
+DEF TITLE_ROLLS         EQU $9A2F
 DEF FIELD_TOP_LEFT      EQU $9800+1
 DEF TILE_FIELD_EMPTY    EQU 4
 DEF TILE_PIECE_0        EQU 10
diff --git a/src/main.asm b/src/main.asm
index 47abd62..64476f0 100644
--- a/src/main.asm
+++ b/src/main.asm
@@ -65,6 +65,8 @@ Main::
     ldh [hStartSpeed], a
     ld a, h
     ldh [hStartSpeed+1], a
+    ld a, 6
+    ldh [hRNGRerolls], a
     call TimeInit
     call IntrInit
     call InputInit
diff --git a/src/res/sources/tiles.gbr b/src/res/sources/tiles.gbr
index 32a1650f1230a6cf7fcf3ee59660c6257f535e81..49b3803664a44dbfe82378ee8a838058e5a33e82 100644
GIT binary patch
delta 124
zcmaF3f$8A}rVR%a7@0R8RJag7d4fA92Ll8!Pd0QEn-s(e6yva9U|?ooW(H!Q94ZEh
mgJq%OFf|bMlO3zACZ{WiZ%%0V$+y{i0v`tl7Zb>QMg{=vz!U%g

delta 39
tcmaF3f$8A}rVR%a7#TJnRJahoIiT@3-{b`4{hPff@NsZ3G$b&9003Wx4ru@Y

diff --git a/src/res/sources/title_map.gbm b/src/res/sources/title_map.gbm
index 97f5d5943fa8058d5157e2609b6c1538740e71c9..6e461f8b386a2b3daf47c8acc0d32d929e86b9f7 100644
GIT binary patch
delta 303
zcmZ3Yv_xsc8OC}8*GTR^U$Ph~i(|_e7|NI!7z!BTr|xaK$IZZS$GTWfct%eu$JZ<d
z%V;Ksc*%Mu86caHfq?-eW&@;!S#B}@|2m5o$b`#t0@=%eiUNRYzMT~*XZoJSzyQQ5
zLMcqo*|``*8MqnL7?>HJGqZ6rfHZ>)nP?~zk^<Ba1k_Liq&t8Z1Qr14!hHp0$YPIx
ze3(8Rpc*to8C)lZZDTMfw_*9tz_|Gc(`v@e=UJ|>=pAHWIK;qkn1LadfgzHCA&3Fw
j6CgW^fgv1>;=m$}3=AF&3{9I0IoGhWzsq3a0NMZmB!X0H

delta 268
zcmZ3Yv_xsc8OC~_e_0GI3=9m1n1vYs1Hq@}+@k*8y-oMH85r(Z7t1kD>PcnznZ;lk
z&BV|zSkEK^WHSQQgT!orlrYOJ#{VZWc|bxic}^gE8Bmc2P|dfqBIUn+Wik8!Vh!CK
zrswQj45AF&3~E4Ao-?!YFn~0J43T3HoM<Q+5(Cr|1k_Ukq#J-31ZDu~!hHp0Fflfu
z*drhxrd0>XM>Chf<<~kP27_{&Kffk0Y(B!YnsKrKbHe6)mMbiq1(;<SHy_}NWn&lZ
JWMT*E1pqXORY3p%

diff --git a/src/res/tiles.inc b/src/res/tiles.inc
index be97356..4cf7cb7 100644
--- a/src/res/tiles.inc
+++ b/src/res/tiles.inc
@@ -406,132 +406,10 @@ Tiles::
     DB $03,$03,$03,$03,$0F,$0F,$00,$00
     DB $00,$00,$00,$00,$00,$00,$00,$00
     DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
+    DB $03,$03,$02,$02,$02,$02,$03,$03
+    DB $00,$00,$00,$00,$03,$03,$00,$00
+    DB $BA,$BA,$22,$22,$22,$22,$B2,$B2
+    DB $A2,$A2,$A2,$A2,$BB,$BB,$00,$00
 TilesEnd::
 
 
diff --git a/src/res/title_map.inc b/src/res/title_map.inc
index 52422c8..1c794b6 100644
--- a/src/res/title_map.inc
+++ b/src/res/title_map.inc
@@ -21,74 +21,74 @@ DEF TITLE_MAP_INC EQU 1
 
 SECTION "Title Screen Tilemap", ROM0
 TitleScreenTilemap::
-DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
-DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
-DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
-DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
-DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
-DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
-DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
-DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
-DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
-DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
-DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
-DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
-DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
-DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
-DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
-DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
-DB $01,$01,$01,$01,$01,$68,$6A,$6C,$6E,$70
-DB $72,$74,$76,$78,$7A,$01,$01,$01,$01,$01
-DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
-DB $01,$01,$01,$01,$01,$01,$01,$69,$6B,$6D
-DB $6F,$71,$73,$75,$77,$79,$7B,$01,$01,$01
-DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
-DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
-DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
-DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
-DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
-DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
-DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
-DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
-DB $01,$01,$5B,$5D,$50,$5E,$5E,$01,$5E,$5F
-DB $4C,$5D,$5F,$66,$01,$01,$01,$01,$01,$01
-DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
-DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
-DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
-DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
-DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
-DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
-DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
-DB $01,$01,$01,$01,$01,$01,$7E,$01,$57,$50
-DB $61,$50,$57,$01,$01,$81,$42,$42,$42,$42
-DB $82,$01,$01,$01,$01,$01,$01,$01,$01,$01
-DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
-DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
-DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
-DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
-DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
-DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
-DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
-DB $01,$01,$7F,$01,$4D,$60,$5F,$5F,$5A,$59
-DB $5E,$01,$81,$4C,$80,$4D,$82,$01,$01,$01
-DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
-DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
-DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
-DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
-DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
-DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
-DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
-DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
-DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
-DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
-DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
-DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
-DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
-DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
-DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
-DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
-DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
-DB $01,$01
+    DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
+    DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
+    DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
+    DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
+    DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
+    DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
+    DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
+    DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
+    DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
+    DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
+    DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
+    DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
+    DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
+    DB $01,$01,$01,$68,$6A,$6C,$6E,$70,$72,$74
+    DB $76,$78,$7A,$01,$01,$01,$01,$01,$01,$01
+    DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
+    DB $01,$01,$01,$01,$01,$69,$6B,$6D,$6F,$71
+    DB $73,$75,$77,$79,$7B,$01,$01,$01,$01,$01
+    DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
+    DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
+    DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
+    DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
+    DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
+    DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
+    DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
+    DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
+    DB $5B,$5D,$50,$5E,$5E,$01,$5E,$5F,$4C,$5D
+    DB $5F,$66,$01,$01,$01,$01,$01,$01,$01,$01
+    DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
+    DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
+    DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
+    DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
+    DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
+    DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
+    DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
+    DB $01,$01,$01,$01,$7E,$01,$57,$50,$61,$50
+    DB $57,$01,$01,$81,$42,$42,$42,$42,$82,$01
+    DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
+    DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
+    DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
+    DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
+    DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
+    DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
+    DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
+    DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
+    DB $7F,$01,$4D,$60,$5F,$5F,$5A,$59,$5E,$01
+    DB $81,$4C,$80,$4D,$82,$01,$01,$01,$01,$01
+    DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
+    DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
+    DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
+    DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
+    DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
+    DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
+    DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
+    DB $01,$01,$01,$01,$01,$C1,$C2,$C3,$5D,$59
+    DB $52,$01,$5D,$5A,$57,$57,$5E,$01,$81,$48
+    DB $82,$01,$01,$01,$01,$01,$01,$01,$01,$01
+    DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
+    DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
+    DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
+    DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
+    DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
+    DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
+    DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
+    DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
+    DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
+    DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
+    DB $01,$01
 TitleScreenTilemapEnd::
 
 
diff --git a/src/rng.asm b/src/rng.asm
index 2bac82d..63189b9 100644
--- a/src/rng.asm
+++ b/src/rng.asm
@@ -26,6 +26,7 @@ SECTION "High RNG Variables", HRAM
 hRNGSeed:      ds 4
 hPieceHistory: ds 4
 hNextPiece::   ds 1
+hRNGRerolls::  ds 1
 
 
 section "RNG Functions", ROM0
@@ -71,9 +72,15 @@ RNGInit::
 
 
 GetNextPiece::
-    ld e, 7
+    ldh a, [hRNGRerolls]
+    cp a, 0
+    jr nz, :+
+    call NextPiece
+    jr .donerolling
+:   inc a
+    ld e, a
 :   dec e
-    jr z, :+
+    jr z, .donerolling
 
     call NextPiece
     ld hl, hPieceHistory
@@ -89,7 +96,8 @@ GetNextPiece::
     cp a, [hl]
     jr z, :-
 
-:   ldh [hNextPiece], a
+.donerolling
+    ldh [hNextPiece], a
     ld b, a
     ldh a, [hPieceHistory+2]
     ldh [hPieceHistory+3], a
diff --git a/src/state_title.asm b/src/state_title.asm
index 2aa8486..7a0cdd3 100644
--- a/src/state_title.asm
+++ b/src/state_title.asm
@@ -63,8 +63,18 @@ SwitchToTitle::
 
 
 TitleEventLoopHandler::
+    ; Increment RNG leniency?
+    ldh a, [hSelectState]
+    cp a, 1
+    jr nz, :+
+    ldh a, [hRNGRerolls]
+    inc a
+    and a, $0F
+    ldh [hRNGRerolls], a
+    jp EventLoopPostHandler
+
     ; Start game?
-    ldh a, [hStartState]
+:   ldh a, [hStartState]
     ld b, a
     ldh a, [hAState]
     ld c, a
@@ -219,6 +229,12 @@ TitleVBlankHandler::
     ld hl, TITLE_LEVEL+1
     ld [hl], a
 
+    ; Draw RNG
+    ldh a, [hRNGRerolls]
+    add a, TILE_0
+    ld hl, TITLE_ROLLS
+    ld [hl], a
+
     ; Draw A/B
     ldh a, [hSwapAB]
     cp a, 0