From b387bcebc2e45455e23937475f76fc97854641cd Mon Sep 17 00:00:00 2001
From: Randy Thiemann <randy.thiemann@edt.zone>
Date: Tue, 7 Nov 2023 04:51:54 +0100
Subject: [PATCH] RNG Oopsie

---
 bin/DMGTRIS.GBC    | Bin 131072 -> 131072 bytes
 bin/DMGTRIS.map    | 333 +++++++++++++++++++++++----------------------
 bin/DMGTRIS.pocket | Bin 131072 -> 131072 bytes
 bin/DMGTRIS.sym    | 233 +++++++++++++++----------------
 src/rng.asm        |  19 +--
 5 files changed, 295 insertions(+), 290 deletions(-)

diff --git a/bin/DMGTRIS.GBC b/bin/DMGTRIS.GBC
index 7b69c850bb070e3f64a3988c040130d4385f56b5..ed2b3dfbaed53142b7ab203d7620f8071be532c1 100644
GIT binary patch
delta 2223
zcma)-e{54#6vyA`&lSqHhpd*#Sg&nanSI@Gf+TF+ui{wAEI0=92eOqB0~tzO#2;D0
zKp_q>0bW=q60Dn|M%a|91x;}JM$&G*85M}KjQL22p%bC}+O*8p+t+rjQ4;>R?|tq$
z=bm@&z2AFZTU%ONTiO>QfX`SlEEl;?x>mrb*yv}>z}r+}M0J9O!U0AF;1u3+=mXNH
zsZK=o10}(J*E7=7;^O!Sd2|G^{wsp%<!#>3F&w7*qAC01DM_r5A;3PXK(hl(=v!Qj
z`ud@aQj};W&EhpAjteksfwIvxu26|YMIts`*)Aoym;2at)ALwPxhrNwZ1ao-K)Vjl
zxGg3xmKI)bXI&M+0oN<)7BNh?0uO}%HnW#=nld*V!x2rUH$1aXCP`n6H@oWRJ}s^B
zB1t6Z>ES)WfgXMUNh3jT5AO{Q_V9x;=@7lej_eq;6!tSTYezdV$fJB6x9Y=S_$w?j
z+~I!?eTu_kjU2bK6WSbg(i4^%Zt%XbpCY(U&(*O;UGAz@y?WFvU6*6XA{me`a>{U9
zd&&?b?J8+k)IXTz_jZ01AESAnfVx8n)!>)e4|KWk82i0$4z#i(x)#HFJ*h}W*|u-D
zDFWPT9oM4c4(qs;I&QBH@6!KP8rBw0c=0awRsB{-W3TD$kmg!BZ-*%VmI2h0m^=?f
z$TNMMJeHBB&NfGi6^kcN-+8T|>h%Jfcx1ZkZ^M(Il4~p>v6D=`BqVW$i!_TuQfGJ}
z+n8URDIXI#&Ehe!(_Azraheyh$MP*u&ECxaqoK%zpPG&HOt>r`*BEiN3AfD0*+>wJ
zK`z@Hw4Bh~#Wf~;-iY7OVw)E4oR8a$D9;!Sk!g`R{c7YMFmXAiMC`=~vP?MxY^l+a
zRcMq+hVZ4b>s*WuRbJ<4_IKm+<--hZwIb?Gpl0A<hBHty7^1CJh-w2$Oe{hjnhe_7
zlo~`^*Ce{^Zf0va$toMdXX}Lg(jnYlD-f}ju8tCIH=&CWm_~7a22o*hl2jDFLC_;0
z7jTuEPSD58P~SE`gDc5#sSNev@GMO>Jz_x{IzcLk?ve%VjI(-uw6X{Z=t>FrBqg9C
zR{D}q4<4){aYrqvsS}h!q7xSMR-Dz@bbpE`<4lT+!bJyqVVNYtaEh<*f>NCAXL_rM
zo(A&<^K9svMX_ovvb_fqlGK4Dpe_>p3TMopzBK9|iut1hKaUT5Sa4(<j16p-fOe*z
zQ7h?+rN|aDGTbfqhZ1OAQW;>-;Q?p{RfJqAXvYA|p#(I`#^&O&T<k?%9tcvZW^z%`
zT^_XGOM1~|?()!ab~lv43I&WizO06N_|7rS3Qwes>w{<bv$)P(Z-qZa5OA!lA@v8C
z;J$D~$TA*Ll#m6UAiJj8M7|x||9=iH;679X2c<f)Z;gyO%va)=qT92~m-#AwnRzc?
zjgM<FYrsbwnH`{VY^j9`usb$(K#t=~EhyxEhI^?2+Z}u@Jg62rW(9u%o6B%xS*%Ds
zw!1S{!H?7BiA=w&gB;0uBUk8H&<(R<L^pt@gxpPqjcC9F24SZO-%R0bZ_-|o!kc33
zez5_1bGMO&F89F*rHWqk_qY7fUqf^!q+}<ecr=OMB(X1vq{2k(xg?H8aZ@bCm86+W
zArU;8M45NWnwdm0#YC)b3cdG`hJ#3>)V*{&WToiitKDFo(uafSW4^oK9XJL=Bp3I9
zS`rnBgWm&L#E|hWs6o&`iPW)SKN!dXrUyJI!$+!!{wU6Q(5wWHdeH0yU-6*13BKt;
z+5}H}kRib`FJcm$=|ztwINOUJPq5C5isKxb=0oLfB@4XhzU5dSQ{ucuM0ZElW4kdp
zT%wVhW&DL+ewbd{gg*9>13)H1yn-sL%dosWsmjwGU{Ow~GPC=?s;usY+^8yFXhIu(
darF`2m%=Ag_)-chun_Mcsw{M$?}kU7`v<Obf=vJb

delta 2246
zcma)-e{2(F7{~AFPdduBBdnIm#=W+MZuSbOK@3~jkFr4t6a{56ehe5WuqX)`qA_fs
z7^i4}i@S*g=cZ^PFrjGCKgi-i(w4pq7)BsKj!FzH)18E$Wx4v^bzN)Jgfw^W=Y5{%
zefqrb`+eVQZXVIxJmNbIKnJIVIhrG#f%$M%>x!@*5d9V{qS}C=aE!G8w5zQVx`Fg*
zstr*mfYRYeV6pzBwq$68Q5iw3|A=6_M1MGb5X*G8lJdk*N)oGPh;g+hG&aV@f5IiG
z`vjCxrc!3mqg_Pegc!?BGOq~SHCZ&8^}uDDTl6INoG7<^<U~#|zn3&3u3^*^$O`Nm
zbz4gsj#iuZ^ZGULaiGz<Q43Pw=HqdIHQe=r`rI`xIl<(H<<Z>+UG_A*CQwuOvc5{v
z9TG#5{*V|}D5B6QgT9B}uoA7rV54w^rMZ=8I|ie|1Gv#4gY$u`ao!Psjemn>En~!u
zoNOzoOnYR#^Di;lcP@eFIfQwRYU!+aMmi^+-7KDyPK!Mf7Eeo25ff81OcGkJdi2W+
zoOvYAGW$4JqXR_~$DOxr$DI;+`pI*{`Xz}|%*<!XfL4!@3}EnjZohqeA!{e~J!8xG
zNxlBAYGO3KL2~|P-{@T8AhjAO|JJR3(@nu|7aHsWZx?)ap~a4y9KX+yZIkbXaTB-2
zu?c{?<5&q0sF|=$Q{3+a>mVlYy$SNpzDr)S$Yag-BuY%v22bAEJgNH4Nq+5RT|ief
z4=e`88`rkWSxjkM*Dh<Asd0U~Jd%60xFpxmr)l?O^=aEZnm%2-XC!yD*b5chgW^Bx
zTyFfrSj@QbbH%vIg)7{+p$O+ARX<LnVW;Fh#yrGTZhYE>-?Cx94R0yJ+gyloNpUhQ
zGN%hJ!R!_+?o{lR1S%bN#<(gMpI78E=z8$AvH>AUdn*ToEbf+TS$Qu@`+SIc2dGiF
zmld3p0eWa(HKLk<(h`eW2a`kl>NA6A-=b8P+r@4wCs_?Wxc5ahzrF{zEKrHqX1t^j
zUF$|y5|Bj+5f)K0Ib0SB_Yn-KD8vG@+{b9H*=;;hhPs;~EG{9Zs50J#<uOb?ec6jv
zw}D=j<TWqaKE&2lN_7bm(2)`Fbw)r%vi#}sL-<rRi96s$^=)8Q6CLxScZb-TPoK!}
z<ebTHQP}lK7tGS#X9dmo55cU>kFZ_UL{q0Go|@=Ke|k*|mm>eCpd(3nqyy{Is^8R}
z^k>gh{5?s(GVt4>flsK8oIS~b4LY!mj<8lUT`?2+lSWqP4}PJ8x2IReShOz!4PZ%-
zn+9!*z&J`pkD;#+_l?J4)DZ%SvNVwUgYF2S-C@#GmbxQE4{@-r4Cb3)fImDNYTziJ
z<%6mb0}kno*o)@{YkY8D12O*jxupIWEA5gKYL>eRQz=>Cdt~P<>&SmgyZ_4}#DaV0
z!XCYy?Av12Ba4+dsp^(I&vmg{oaNam&c=src!v{z&gZs*h2O9MDxj8M+X@BznFU}n
zMp)tXI$X<(3*a%U+VPmgi`Y|!SCl1-bl}=x&O-Qkq%oE0!g46kopuRD{FF`@lO(zh
zm{M|cO<sW_A#kcYP54#@=ZDkwiVR+t<lt*{&^5k^EOdDkE>jle{(rRPSH2j^PUy)_
zD0m=^Kculcjika<?D;faRd8K0#f`L?Od%CKm_|c**qWP0GR0J^eHg?4BMqKNV@7c1
zR>;fH$I%bKH>?ky=%Xk&=|eaOL?l;sfK{i6gco-}9x>#61XfTrP^#xw?*=D1z;q;p
za-yUP<uh_VgvO-!Y6y)@@r@8FO!2J{vZZ)1gq$fhgb|zK+%S47#ra|MY>Mq+R5HZz
ztSBlEnmG_Pk1WTUq!K4gCA!<c3fH=%OQnq7V-PQPiI?c5_2{c8IRIoL#H*@ub{RI7
zr&W2f6};wQRpxg7Ta~jrVZ5TsSL)H)=#csd@5<mGGx%Bto3I+s6ID(Q{?Z9gF8Lct
Caf@*P

diff --git a/bin/DMGTRIS.map b/bin/DMGTRIS.map
index 19e5919..46b9d4f 100644
--- a/bin/DMGTRIS.map
+++ b/bin/DMGTRIS.map
@@ -274,171 +274,172 @@ ROM0 bank #0:
 	         $2394 = SFXPlay.getRegister
 	         $239e = !26
 	         $23a8 = SFXPlay.savePlayhead
-	SECTION: $23b1-$259e ($01ee bytes) ["RNG Functions"]
-	         $23b1 = RNGInit
-	         $23e1 = !0
-	         $23fc = RNGInit.complexinit
-	         $2413 = !1
-	         $242d = ShiftHistory
-	         $244a = GetNextHellPiece
-	         $244f = GetNextTGM1Piece
-	         $2452 = !2
-	         $246a = !3
-	         $246c = GetNextTGM2Piece
-	         $246f = !4
-	         $2487 = !5
-	         $2489 = GetNextNesPiece
-	         $2497 = GetNextTGM3Piece
-	         $249a = !6
-	         $24bd = !7
-	         $24c0 = !8
-	         $24d0 = !9
-	         $24da = !10
-	         $24e8 = !11
-	         $24f7 = !12
-	         $2503 = !13
-	         $250f = !14
-	         $251b = !15
-	         $2527 = !16
-	         $2533 = !17
-	         $253f = !18
-	         $254e = GetNextPiece
-	         $255c = GetNextPiece.nextpiecejumps
-	         $256b = Next35Piece
-	         $256b = !19
-	         $2575 = Next7Piece
-	         $2575 = !20
-	         $257f = NextByte
-	SECTION: $259f-$2741 ($01a3 bytes) ["Level Functions"]
-	         $259f = LevelInit
-	         $25ef = LevelUp
-	         $2613 = LevelUp.doit
-	         $2657 = LevelUp.checknlevel
-	         $2685 = !0
-	         $269d = !1
-	         $26a6 = LevelUp.bellmaybe
-	         $26b8 = LevelUp.leveljinglemaybe
-	         $26c5 = LevelUp.checkspeedup
-	         $26d6 = !2
-	         $26e3 = !3
-	         $26f4 = !4
-	         $2701 = DoSpeedUp
-	SECTION: $2742-$288b ($014a bytes) ["Progress Data"]
-	         $2742 = sProgressData
-	SECTION: $288c-$296b ($00e0 bytes) ["Score Functions"]
-	         $288c = ScoreInit
-	         $28b4 = IncreaseScore
-	         $28ec = IncreaseScore.doConvert
-	         $28ee = !0
-	         $2904 = IncreaseScore.carry
-	         $2906 = IncreaseScore.postConvert
-	         $2913 = !1
-	         $291a = IncreaseScore.preAddDigit
-	         $2942 = IncreaseScore.addDigit
-	         $2958 = IncreaseScore.nextDigit
-	SECTION: $296c-$2a38 ($00cd bytes) ["Input Functions"]
-	         $296c = InputInit
-	         $297e = GetInput
-	         $297e = GetInput.btns
-	         $298b = GetInput.readA
-	         $298f = GetInput.setA
-	         $299a = GetInput.clearA
-	         $299d = GetInput.readB
-	         $29a1 = GetInput.setB
-	         $29ac = GetInput.clearB
-	         $29af = GetInput.readSelect
-	         $29b3 = GetInput.setSelect
-	         $29be = GetInput.clearSelect
-	         $29c1 = GetInput.readStart
-	         $29c5 = GetInput.setStart
-	         $29d0 = GetInput.clearStart
-	         $29d3 = GetInput.dpad
-	         $29e0 = GetInput.readUp
-	         $29e4 = GetInput.setUp
-	         $29ef = GetInput.clearUp
-	         $29f2 = GetInput.readDown
-	         $29f6 = GetInput.setDown
-	         $2a01 = GetInput.clearDown
-	         $2a04 = GetInput.readLeft
-	         $2a08 = GetInput.setLeft
-	         $2a13 = GetInput.clearLeft
-	         $2a16 = GetInput.readRight
-	         $2a1a = GetInput.setRight
-	         $2a25 = GetInput.clearRight
-	         $2a28 = GetInput.priorities
-	         $2a33 = GetInput.zero
-	SECTION: $2a39-$2aef ($00b7 bytes) ["SRAM Functions"]
-	         $2a39 = RestoreSRAM
-	         $2a92 = InitializeSRAM
-	SECTION: $2af0-$2ba1 ($00b2 bytes) ["Progress Functions"]
-	         $2af0 = SetProgress
-	         $2afb = SetProgress.loop
-	         $2aff = SetProgress.correct
-	         $2b26 = SetProgress.wvr_u1
-	         $2b32 = SetProgress.wvr_u2
-	         $2b40 = SetProgress.wvr_u3
-	         $2b4c = SetProgress.wvr_u4
-	         $2b5a = SetProgress.wvr_u5
-	         $2b66 = SetProgress.wvr_u6
-	         $2b74 = SetProgress.wvr_u7
-	         $2b80 = SetProgress.wvr_u8
-	         $2b8e = SetProgress.wvr_u9
-	         $2b9a = SetProgress.wvr_u10
-	SECTION: $2ba2-$2c45 ($00a4 bytes) ["Code Entry Point"]
-	         $2ba2 = Main
-	         $2bb7 = Main.wvr_u1
-	         $2bc0 = !0
-	         $2bd0 = Main.notgbc
-	         $2bff = Main.wvb_u2
-	         $2c04 = !1
-	         $2c0a = EventLoop
-	         $2c20 = EventLoop.eventloopjumps
-	         $2c29 = EventLoopPostHandler
-	         $2c2b = EventLoopPostHandler.wvb_u3
-	         $2c3d = EventLoopPostHandler.vblankjumps
-	SECTION: $2c46-$2ccd ($0088 bytes) ["Time Functions"]
-	         $2c46 = TimeInit
-	         $2c5b = ResetGameTime
-	         $2c66 = CheckTorikan
-	         $2c7d = CheckTorikan.failure
-	         $2c7f = CheckTorikan.success
-	         $2c82 = HandleTimers
-	         $2caa = HandleTimers.go
-	SECTION: $2cce-$2d3b ($006e bytes) ["Title Function Trampolines"]
-	         $2cce = SwitchToTitle
-	         $2cd8 = TitleEventLoopHandler
-	         $2ce2 = TitleVBlankHandler
-	         $2cec = DrawOption6
-	SECTION: $2d3c-$2d8d ($0052 bytes) ["Tile Functions"]
-	         $2d3c = LoadTitleTiles
-	         $2d5a = LoadGameplayTiles
-	         $2d70 = LoadGameplayTiles.gbc
-	         $2d7f = LoadGameplayTiles.dmg
-	SECTION: $2d8e-$2dc9 ($003c bytes) ["Time Data"]
-	         $2d8e = sFramesToCS
-	SECTION: $2dca-$2df7 ($002e bytes) ["Memory Functions"]
-	         $2dca = UnsafeMemCopy
-	         $2dd3 = SafeMemCopy.wvr_u1
-	         $2dd3 = SafeMemCopy
-	         $2de2 = UnsafeMemSet
-	         $2dea = SafeMemSet
-	         $2dea = SafeMemSet.wvr_u2
-	SECTION: $2df8-$2e1f ($0028 bytes) ["Gameplay Function Trampolines"]
-	         $2df8 = SwitchToGameplay
-	         $2e02 = SwitchToGameplayBig
-	         $2e0c = GamePlayEventLoopHandler
-	         $2e16 = GamePlayBigEventLoopHandler
-	SECTION: $2e20-$2e41 ($0022 bytes) ["OAM Functions"]
-	         $2e20 = CopyOAMHandler
-	         $2e2c = ClearOAM
-	SECTION: $2e42-$2e5a ($0019 bytes) ["Interrupt Initialization Functions"]
-	         $2e42 = IntrInit
-	         $2e46 = InitializeLCDCInterrupt
-	SECTION: $2e5b-$2e64 ($000a bytes) ["OAM DMA Code"]
-	         $2e5b = OAMDMA
-	         $2e65 = OAMDMAEnd
-	EMPTY: $2e65-$3fff ($119b bytes)
-	TOTAL EMPTY: $11a6 bytes
+	SECTION: $23b1-$25a5 ($01f5 bytes) ["RNG Functions"]
+	         $23b1 = HarvestEntropy
+	         $23b2 = RNGInit
+	         $23e8 = !0
+	         $2403 = RNGInit.complexinit
+	         $241a = !1
+	         $2434 = ShiftHistory
+	         $2451 = GetNextHellPiece
+	         $2456 = GetNextTGM1Piece
+	         $2459 = !2
+	         $2471 = !3
+	         $2473 = GetNextTGM2Piece
+	         $2476 = !4
+	         $248e = !5
+	         $2490 = GetNextNesPiece
+	         $249e = GetNextTGM3Piece
+	         $24a1 = !6
+	         $24c4 = !7
+	         $24c7 = !8
+	         $24d7 = !9
+	         $24e1 = !10
+	         $24ef = !11
+	         $24fe = !12
+	         $250a = !13
+	         $2516 = !14
+	         $2522 = !15
+	         $252e = !16
+	         $253a = !17
+	         $2546 = !18
+	         $2555 = GetNextPiece
+	         $2563 = GetNextPiece.nextpiecejumps
+	         $2572 = Next35Piece
+	         $2572 = !19
+	         $257c = Next7Piece
+	         $257c = !20
+	         $2586 = NextByte
+	SECTION: $25a6-$2748 ($01a3 bytes) ["Level Functions"]
+	         $25a6 = LevelInit
+	         $25f6 = LevelUp
+	         $261a = LevelUp.doit
+	         $265e = LevelUp.checknlevel
+	         $268c = !0
+	         $26a4 = !1
+	         $26ad = LevelUp.bellmaybe
+	         $26bf = LevelUp.leveljinglemaybe
+	         $26cc = LevelUp.checkspeedup
+	         $26dd = !2
+	         $26ea = !3
+	         $26fb = !4
+	         $2708 = DoSpeedUp
+	SECTION: $2749-$2892 ($014a bytes) ["Progress Data"]
+	         $2749 = sProgressData
+	SECTION: $2893-$2972 ($00e0 bytes) ["Score Functions"]
+	         $2893 = ScoreInit
+	         $28bb = IncreaseScore
+	         $28f3 = IncreaseScore.doConvert
+	         $28f5 = !0
+	         $290b = IncreaseScore.carry
+	         $290d = IncreaseScore.postConvert
+	         $291a = !1
+	         $2921 = IncreaseScore.preAddDigit
+	         $2949 = IncreaseScore.addDigit
+	         $295f = IncreaseScore.nextDigit
+	SECTION: $2973-$2a3f ($00cd bytes) ["Input Functions"]
+	         $2973 = InputInit
+	         $2985 = GetInput
+	         $2985 = GetInput.btns
+	         $2992 = GetInput.readA
+	         $2996 = GetInput.setA
+	         $29a1 = GetInput.clearA
+	         $29a4 = GetInput.readB
+	         $29a8 = GetInput.setB
+	         $29b3 = GetInput.clearB
+	         $29b6 = GetInput.readSelect
+	         $29ba = GetInput.setSelect
+	         $29c5 = GetInput.clearSelect
+	         $29c8 = GetInput.readStart
+	         $29cc = GetInput.setStart
+	         $29d7 = GetInput.clearStart
+	         $29da = GetInput.dpad
+	         $29e7 = GetInput.readUp
+	         $29eb = GetInput.setUp
+	         $29f6 = GetInput.clearUp
+	         $29f9 = GetInput.readDown
+	         $29fd = GetInput.setDown
+	         $2a08 = GetInput.clearDown
+	         $2a0b = GetInput.readLeft
+	         $2a0f = GetInput.setLeft
+	         $2a1a = GetInput.clearLeft
+	         $2a1d = GetInput.readRight
+	         $2a21 = GetInput.setRight
+	         $2a2c = GetInput.clearRight
+	         $2a2f = GetInput.priorities
+	         $2a3a = GetInput.zero
+	SECTION: $2a40-$2af6 ($00b7 bytes) ["SRAM Functions"]
+	         $2a40 = RestoreSRAM
+	         $2a99 = InitializeSRAM
+	SECTION: $2af7-$2ba8 ($00b2 bytes) ["Progress Functions"]
+	         $2af7 = SetProgress
+	         $2b02 = SetProgress.loop
+	         $2b06 = SetProgress.correct
+	         $2b2d = SetProgress.wvr_u1
+	         $2b39 = SetProgress.wvr_u2
+	         $2b47 = SetProgress.wvr_u3
+	         $2b53 = SetProgress.wvr_u4
+	         $2b61 = SetProgress.wvr_u5
+	         $2b6d = SetProgress.wvr_u6
+	         $2b7b = SetProgress.wvr_u7
+	         $2b87 = SetProgress.wvr_u8
+	         $2b95 = SetProgress.wvr_u9
+	         $2ba1 = SetProgress.wvr_u10
+	SECTION: $2ba9-$2c4c ($00a4 bytes) ["Code Entry Point"]
+	         $2ba9 = Main
+	         $2bbe = Main.wvr_u1
+	         $2bc7 = !0
+	         $2bd7 = Main.notgbc
+	         $2c06 = Main.wvb_u2
+	         $2c0b = !1
+	         $2c11 = EventLoop
+	         $2c27 = EventLoop.eventloopjumps
+	         $2c30 = EventLoopPostHandler
+	         $2c32 = EventLoopPostHandler.wvb_u3
+	         $2c44 = EventLoopPostHandler.vblankjumps
+	SECTION: $2c4d-$2cd4 ($0088 bytes) ["Time Functions"]
+	         $2c4d = TimeInit
+	         $2c62 = ResetGameTime
+	         $2c6d = CheckTorikan
+	         $2c84 = CheckTorikan.failure
+	         $2c86 = CheckTorikan.success
+	         $2c89 = HandleTimers
+	         $2cb1 = HandleTimers.go
+	SECTION: $2cd5-$2d42 ($006e bytes) ["Title Function Trampolines"]
+	         $2cd5 = SwitchToTitle
+	         $2cdf = TitleEventLoopHandler
+	         $2ce9 = TitleVBlankHandler
+	         $2cf3 = DrawOption6
+	SECTION: $2d43-$2d94 ($0052 bytes) ["Tile Functions"]
+	         $2d43 = LoadTitleTiles
+	         $2d61 = LoadGameplayTiles
+	         $2d77 = LoadGameplayTiles.gbc
+	         $2d86 = LoadGameplayTiles.dmg
+	SECTION: $2d95-$2dd0 ($003c bytes) ["Time Data"]
+	         $2d95 = sFramesToCS
+	SECTION: $2dd1-$2dfe ($002e bytes) ["Memory Functions"]
+	         $2dd1 = UnsafeMemCopy
+	         $2dda = SafeMemCopy.wvr_u1
+	         $2dda = SafeMemCopy
+	         $2de9 = UnsafeMemSet
+	         $2df1 = SafeMemSet
+	         $2df1 = SafeMemSet.wvr_u2
+	SECTION: $2dff-$2e26 ($0028 bytes) ["Gameplay Function Trampolines"]
+	         $2dff = SwitchToGameplay
+	         $2e09 = SwitchToGameplayBig
+	         $2e13 = GamePlayEventLoopHandler
+	         $2e1d = GamePlayBigEventLoopHandler
+	SECTION: $2e27-$2e48 ($0022 bytes) ["OAM Functions"]
+	         $2e27 = CopyOAMHandler
+	         $2e33 = ClearOAM
+	SECTION: $2e49-$2e61 ($0019 bytes) ["Interrupt Initialization Functions"]
+	         $2e49 = IntrInit
+	         $2e4d = InitializeLCDCInterrupt
+	SECTION: $2e62-$2e6b ($000a bytes) ["OAM DMA Code"]
+	         $2e62 = OAMDMA
+	         $2e6c = OAMDMAEnd
+	EMPTY: $2e6c-$3fff ($1194 bytes)
+	TOTAL EMPTY: $119f bytes
 
 ROMX bank #1:
 	SECTION: $4000-$4007 ($0008 bytes) ["Bank ID BANK_OTHER"]
@@ -2463,7 +2464,7 @@ HRAM bank #0:
 	TOTAL EMPTY: $0003 bytes
 
 SUMMARY:
-	ROM0: 11866 bytes used / 4518 free
+	ROM0: 11873 bytes used / 4511 free
 	ROMX: 56523 bytes used / 41781 free in 6 banks
 	SRAM: 14 bytes used / 8178 free in 1 bank
 	WRAM0: 3515 bytes used / 581 free
diff --git a/bin/DMGTRIS.pocket b/bin/DMGTRIS.pocket
index 87c76700129566919eab9d1a91223ebde3c58116..0f92c5b3cc9e03993feb8b924ee2109d8c9bfdb9 100644
GIT binary patch
delta 2223
zcma)-e{54#6vyA`&lL*WLsrXVtk<@z%)V|ogCuO-ui{wAEI0=92eOqB0~tzO#2;D0
zKp{>s0bW=q5}cc&M%a`pMNM${M$&G*85M}KjQL22p%bC}+O*8p`(E3%MoIYN-TS%c
zoO^oiz2AG=+M3qdn)amx;B!_A%O%H8xmUob)Er=}z&kWjM0J3U!a+s@&?)vx=mRpQ
zsSZT-10}-&_cQX-(xUhbr7(k7{}sXX@(y44D2~v5LdyPlN)jt(2(r(r(3~I>{tg$R
zzJ4gBRK>bUt8@*C<AMyEuWoRUt27cxp@f~OZj+PT%l+)S>A5VY-W4+<wrR#fpxuXN
z+?JA#rN!>;%&QXE?|wzwEQJYo@S!lkX7+M+W5#B4B&y5sMP~IWWHT4z&F;E+Ps^))
zNEQuwdw6eXpobqo@@UA{!}~&mJ^Y|TK16SEA}0ntg#!%DI?+xHN`bHA7GnfVe?=sw
zJN(b#&u~PlQ{onOLZ7WodLnYu4c<TYQxw-4xmwn2$XV55)Q(!^>#|LmBm?qCPnvG)
zPntsHyGp(*+EZ5Ly`3M&=jc8lplugJb@*lWLqiTc#{OWK3oY!3q1m+FNGeiLj_unW
zsvx)8z%?7VLk4c8f!kxiyNth;MDzs{KD>*4)wmVX*lR{7q`6nl-yzAnWdiLaChfr}
zX=jd;W*PakS=MNgYVqXhJFn$ezMk)pj!bv|ZF&+kN}Vk%?IepY4$C?tg}OyyIqBGj
zyrK-{n55Gx9g}ui3&&)nVUOn7po+bj_eXu91wS<h=UQ-S9<DayDhqC2fU}S&7L!u3
zCuBRJyNjzW_`Dgvp~ntA-njs`nNhAe6ei0eYx>p9Jz(LoEs5BRQDmEP2H6s`E3?3?
zkPYEWrPsL_9jv&{(d_T$=gWo}+HObGn?TLL!whGl6fi{FD-qQSl$2P+I&|r@y)iY2
zwy#MH*>{+&WhAR&2%oJL^UH^DTa8G>R<c?k+G#--qcDx)0t})e<R)n-e1o7@L@wwq
zvz(xhm7>0F0R~r)>rxT!#gW;%EPBL-Hgteo6x}5o+8Jl<dZDr?3Ft}*_%tP;JXZRW
za1S1=BymS<sIddoVxki^^j4g;S#*DjC;d!{i^7HbdtsR@%5bW0?t)sH6<~TRiJk^?
z2Xh_hnoYH8EpogMGLqDVWS}h+{i@EGf96ubKNRx|6TgU0d{}g(ABatCl7W6!fYGYy
z@}<ZTGcw#Q&qp$7SyB;X(4hfn0!@@WDQL$4%%w!MD#qsFu^j9}U0w)LnkMp4&|O}%
z&qqeWHg|dHID6_#VTB6DU0+o}9enSaW``%z#*Lvf{8?P<sk6hM5(v6hR+IXJOlWT;
zDrOmvs*1@5Pmoj7Y$CrM+V_7BF6cQ}4F}`~a&8TbHNscmn4;S<t(W;qewlR-Uxkn9
zF>AtyT^a45ac!xAa&WpfwnMh-Obw`%0fu|29y?up4Lqn72UZn-0b5IPLusr?BX)Yy
zSHX|dm5EHhtb=UXc{5kwTG$P<V?@`3u9&<{1r2Dx3nuZT3ExcNEML-Ip2C}A?0K;s
zdULjsjV|-U2&EAo`up2{;jckB2{}0l0goi{coO@PNGeRko=f7WfSY0|t|ZN535npz
zBr1GU){G>QB_?7GQ|P;gG+aa)C7z|*Au~lEU%vzPDSfzzJ{EZL--V+<L~?OAXk~&(
zT>NgxB!=|&KntP<ish~i`@lplFg@T!>3&j$@JDgZi)JTy)QjdM_=*?JOYluE(kFP*
zi%bbt_z;ue3?F(l!C5}^c!CW+R21j%G(Rfys9E48_btb|m=fnNBDy=g9y`sU;bNWK
zs^Bm5^27AnM)ZlFTmZ5V;uTd{Rf?5mNmZV12b+3Il^NatRb^E-<Or&Kp%HEL$JIx8
ZZwh~#!k1E5g~fOmQDuSWd^bGu+&|H>f=~be

delta 2246
zcma)-e{2(F7{~AFPdW<Q5mw7&aIbBlo4o>R5W`mXqij&ZiVkHmehe5WuqX)u(HIyg
zMidQjafe8-4n-4wOe|XT53+b8X}i7*7)BsKj!FzH=uX1VvRr-d+O9QfLYlkx^FGh>
zK7HQz{l4$Dwhn1+9rCRPpq<mgEX~n_!8ve6>x!}-5d9V{qILsA;W%pn2&k<QI)U_Q
zYB!>~fYRY;aK8Sewk$ousEi=ie?+hyqCb*2jAgo0N!gW7Nn+IuajwyXM#b60Pq++q
zc0mPYDrW{f+Ib{Sh_l=T^OE3QlSQLh4cu_^Ha*EbE5<DzI-V2E@1=~0YZ*2P@`C$@
z-PV$Zqt)j9!kZfSIJnNbRtr+_#^VWq72LJr=7JS2Imr}6<Pn_)-S8=RMX+Ja%laBg
zcSH<J`XgdQp{PRL27M2`W+_^V!A9XIOLI%nRt!dk`|&!549*9##(78lHSrCWwTuz3
z<78WLb=D*6oqvh3zOzYO=Md@~wbB{!v~*THvq3y7of3N_ES{2LA||F-ge0_H@#q&9
zI}1skMfTCIbq*9uo^al_op4Izxk;Yu)-Oq%VrD*52DEvMWB`L#a|i5W$FO!%-!rzH
zpVaH`s3k_z8zkp%_O;Fh4pOUu@^9YkH{B5YcA>>C@OHsx7q;2)Cdcp7WZT4h5xj}p
z=vWWH-Ek}h2sVt{qA9)U1nU4M@4ZR#9)6d+W{}5P<Vlv9rVO0CvtdH*n-l!nOS+)0
zqz)_w#+%Rv<UFQ4p$o_wW^zIwkWJjHrDX+%K25-r*QX75G<~{&$HW~g^+FZ*p!AO>
zmm9w@3Nvo}Tq&+`;VL(7DZxcZ)sNF?*dck3GY@f%8=rFFw`|yN!y8NR78hb%Qi4p2
z%;~&KFuMhdI}>|3iOL6^ajwS27nZmTx*mMBqF+eS-s*lKkGthsRN2eYJ|Cjq0csfT
zWd$c?fF9aci>Owhw8Wy;!Q|7v=G-9KH!suWcCza$NmfG-?tM|sukXRz>Qy4PX)h^6
zH@eZ~B;-*-ltq+G4wr?(eFVcQ3i03!_i>tQbsN8{K%JYSEG{Fbs5;Ss<&jJgeaVZK
z?*_dp$*W$pHO<y#N_9yR(4G_UbxuH4s{E;mBe=Vk#2xaY=G|ac6CL-WchhVwqPucD
z`KNPS6n1^m0W);>SwZvtLojQLqHISk(Ny>N?(u%~r`I%hA@Y9;I+Bz}I<P*i`b~k9
zfB1C8-;?qy0}rMLKA}4D_oN24=)g82%395I)pX=f8Cl_G=nEaZJ+(T{qJ2?l0ZWqH
zG-yi{MpG(!41Hs8-&h<$?O~88OAEO_==Lz$6(K!ksoTSJnnO($FvkS_{Lz`v0LS<|
zAJh!#cSxtjUR)Py@WFiz#QEoElltSVv{O#1S?(rH<z#{Hk)5-wBL6Mz`Y(qN5AB@|
zd-Qg)Z}VA?ELP)`s<#z-u8Fnc49^a6CO&Gz+nxAxzMu^({F-{Gf<}I28x-@W>%nA<
zvcl_4xRDp@;W4Y)@tDL5*i(U*RHTY@;Koq?T=;pYF_Y>1Vkp*~atS5;r2Q~5MRXG|
z<>cm?xCBMR;8b^-@U0v!ie&9oIlL;xq1T$AW9%lf(3LT`L|K&k|IwCT`C=$Lp(i_`
z;Gr!3kj2g{k_t1i=dyT3!Bwdg*Ry6ag-q~377dX>Ye5#t6f?2*L5%#5G<YJ7X`$(x
zp)f}u$36hxpgwq_kCM=Y58*HnkzC#mR-GaeUfd3a#E}0HSV7f5xt?FX3!LNt)6p=>
zkC7^r&&atj8kylMVKgek*TZN`hHr(DEyDw0<jk-kg4hffM9@<iE{dRMGi;BbvNR|1
zVyH4?=0MauvK$*yN*p(t=<dKW+~|@nmNR;fLA=l*UZfW`qpxD*0Fa3gud2$K71&sr
zRprSx@R|ozS+M`#s+_qW#wx0Or5UY^rPW7xXAb|E!&h_Igw=SSsB&WHm;LbMg1-T6
CL5p+%

diff --git a/bin/DMGTRIS.sym b/bin/DMGTRIS.sym
index 5b8f76e..7386223 100644
--- a/bin/DMGTRIS.sym
+++ b/bin/DMGTRIS.sym
@@ -209,122 +209,123 @@
 00:2388 SFXPlay.play
 00:2394 SFXPlay.getRegister
 00:23a8 SFXPlay.savePlayhead
-00:23b1 RNGInit
-00:23fc RNGInit.complexinit
-00:242d ShiftHistory
-00:244a GetNextHellPiece
-00:244f GetNextTGM1Piece
-00:246c GetNextTGM2Piece
-00:2489 GetNextNesPiece
-00:2497 GetNextTGM3Piece
-00:254e GetNextPiece
-00:255c GetNextPiece.nextpiecejumps
-00:256b Next35Piece
-00:2575 Next7Piece
-00:257f NextByte
-00:259f LevelInit
-00:25ef LevelUp
-00:2613 LevelUp.doit
-00:2657 LevelUp.checknlevel
-00:26a6 LevelUp.bellmaybe
-00:26b8 LevelUp.leveljinglemaybe
-00:26c5 LevelUp.checkspeedup
-00:2701 DoSpeedUp
-00:2742 sProgressData
-00:288c ScoreInit
-00:28b4 IncreaseScore
-00:28ec IncreaseScore.doConvert
-00:2904 IncreaseScore.carry
-00:2906 IncreaseScore.postConvert
-00:291a IncreaseScore.preAddDigit
-00:2942 IncreaseScore.addDigit
-00:2958 IncreaseScore.nextDigit
-00:296c InputInit
-00:297e GetInput
-00:297e GetInput.btns
-00:298b GetInput.readA
-00:298f GetInput.setA
-00:299a GetInput.clearA
-00:299d GetInput.readB
-00:29a1 GetInput.setB
-00:29ac GetInput.clearB
-00:29af GetInput.readSelect
-00:29b3 GetInput.setSelect
-00:29be GetInput.clearSelect
-00:29c1 GetInput.readStart
-00:29c5 GetInput.setStart
-00:29d0 GetInput.clearStart
-00:29d3 GetInput.dpad
-00:29e0 GetInput.readUp
-00:29e4 GetInput.setUp
-00:29ef GetInput.clearUp
-00:29f2 GetInput.readDown
-00:29f6 GetInput.setDown
-00:2a01 GetInput.clearDown
-00:2a04 GetInput.readLeft
-00:2a08 GetInput.setLeft
-00:2a13 GetInput.clearLeft
-00:2a16 GetInput.readRight
-00:2a1a GetInput.setRight
-00:2a25 GetInput.clearRight
-00:2a28 GetInput.priorities
-00:2a33 GetInput.zero
-00:2a39 RestoreSRAM
-00:2a92 InitializeSRAM
-00:2af0 SetProgress
-00:2afb SetProgress.loop
-00:2aff SetProgress.correct
-00:2b26 SetProgress.wvr_u1
-00:2b32 SetProgress.wvr_u2
-00:2b40 SetProgress.wvr_u3
-00:2b4c SetProgress.wvr_u4
-00:2b5a SetProgress.wvr_u5
-00:2b66 SetProgress.wvr_u6
-00:2b74 SetProgress.wvr_u7
-00:2b80 SetProgress.wvr_u8
-00:2b8e SetProgress.wvr_u9
-00:2b9a SetProgress.wvr_u10
-00:2ba2 Main
-00:2bb7 Main.wvr_u1
-00:2bd0 Main.notgbc
-00:2bff Main.wvb_u2
-00:2c0a EventLoop
-00:2c20 EventLoop.eventloopjumps
-00:2c29 EventLoopPostHandler
-00:2c2b EventLoopPostHandler.wvb_u3
-00:2c3d EventLoopPostHandler.vblankjumps
-00:2c46 TimeInit
-00:2c5b ResetGameTime
-00:2c66 CheckTorikan
-00:2c7d CheckTorikan.failure
-00:2c7f CheckTorikan.success
-00:2c82 HandleTimers
-00:2caa HandleTimers.go
-00:2cce SwitchToTitle
-00:2cd8 TitleEventLoopHandler
-00:2ce2 TitleVBlankHandler
-00:2cec DrawOption6
-00:2d3c LoadTitleTiles
-00:2d5a LoadGameplayTiles
-00:2d70 LoadGameplayTiles.gbc
-00:2d7f LoadGameplayTiles.dmg
-00:2d8e sFramesToCS
-00:2dca UnsafeMemCopy
-00:2dd3 SafeMemCopy.wvr_u1
-00:2dd3 SafeMemCopy
-00:2de2 UnsafeMemSet
-00:2dea SafeMemSet
-00:2dea SafeMemSet.wvr_u2
-00:2df8 SwitchToGameplay
-00:2e02 SwitchToGameplayBig
-00:2e0c GamePlayEventLoopHandler
-00:2e16 GamePlayBigEventLoopHandler
-00:2e20 CopyOAMHandler
-00:2e2c ClearOAM
-00:2e42 IntrInit
-00:2e46 InitializeLCDCInterrupt
-00:2e5b OAMDMA
-00:2e65 OAMDMAEnd
+00:23b1 HarvestEntropy
+00:23b2 RNGInit
+00:2403 RNGInit.complexinit
+00:2434 ShiftHistory
+00:2451 GetNextHellPiece
+00:2456 GetNextTGM1Piece
+00:2473 GetNextTGM2Piece
+00:2490 GetNextNesPiece
+00:249e GetNextTGM3Piece
+00:2555 GetNextPiece
+00:2563 GetNextPiece.nextpiecejumps
+00:2572 Next35Piece
+00:257c Next7Piece
+00:2586 NextByte
+00:25a6 LevelInit
+00:25f6 LevelUp
+00:261a LevelUp.doit
+00:265e LevelUp.checknlevel
+00:26ad LevelUp.bellmaybe
+00:26bf LevelUp.leveljinglemaybe
+00:26cc LevelUp.checkspeedup
+00:2708 DoSpeedUp
+00:2749 sProgressData
+00:2893 ScoreInit
+00:28bb IncreaseScore
+00:28f3 IncreaseScore.doConvert
+00:290b IncreaseScore.carry
+00:290d IncreaseScore.postConvert
+00:2921 IncreaseScore.preAddDigit
+00:2949 IncreaseScore.addDigit
+00:295f IncreaseScore.nextDigit
+00:2973 InputInit
+00:2985 GetInput
+00:2985 GetInput.btns
+00:2992 GetInput.readA
+00:2996 GetInput.setA
+00:29a1 GetInput.clearA
+00:29a4 GetInput.readB
+00:29a8 GetInput.setB
+00:29b3 GetInput.clearB
+00:29b6 GetInput.readSelect
+00:29ba GetInput.setSelect
+00:29c5 GetInput.clearSelect
+00:29c8 GetInput.readStart
+00:29cc GetInput.setStart
+00:29d7 GetInput.clearStart
+00:29da GetInput.dpad
+00:29e7 GetInput.readUp
+00:29eb GetInput.setUp
+00:29f6 GetInput.clearUp
+00:29f9 GetInput.readDown
+00:29fd GetInput.setDown
+00:2a08 GetInput.clearDown
+00:2a0b GetInput.readLeft
+00:2a0f GetInput.setLeft
+00:2a1a GetInput.clearLeft
+00:2a1d GetInput.readRight
+00:2a21 GetInput.setRight
+00:2a2c GetInput.clearRight
+00:2a2f GetInput.priorities
+00:2a3a GetInput.zero
+00:2a40 RestoreSRAM
+00:2a99 InitializeSRAM
+00:2af7 SetProgress
+00:2b02 SetProgress.loop
+00:2b06 SetProgress.correct
+00:2b2d SetProgress.wvr_u1
+00:2b39 SetProgress.wvr_u2
+00:2b47 SetProgress.wvr_u3
+00:2b53 SetProgress.wvr_u4
+00:2b61 SetProgress.wvr_u5
+00:2b6d SetProgress.wvr_u6
+00:2b7b SetProgress.wvr_u7
+00:2b87 SetProgress.wvr_u8
+00:2b95 SetProgress.wvr_u9
+00:2ba1 SetProgress.wvr_u10
+00:2ba9 Main
+00:2bbe Main.wvr_u1
+00:2bd7 Main.notgbc
+00:2c06 Main.wvb_u2
+00:2c11 EventLoop
+00:2c27 EventLoop.eventloopjumps
+00:2c30 EventLoopPostHandler
+00:2c32 EventLoopPostHandler.wvb_u3
+00:2c44 EventLoopPostHandler.vblankjumps
+00:2c4d TimeInit
+00:2c62 ResetGameTime
+00:2c6d CheckTorikan
+00:2c84 CheckTorikan.failure
+00:2c86 CheckTorikan.success
+00:2c89 HandleTimers
+00:2cb1 HandleTimers.go
+00:2cd5 SwitchToTitle
+00:2cdf TitleEventLoopHandler
+00:2ce9 TitleVBlankHandler
+00:2cf3 DrawOption6
+00:2d43 LoadTitleTiles
+00:2d61 LoadGameplayTiles
+00:2d77 LoadGameplayTiles.gbc
+00:2d86 LoadGameplayTiles.dmg
+00:2d95 sFramesToCS
+00:2dd1 UnsafeMemCopy
+00:2dda SafeMemCopy.wvr_u1
+00:2dda SafeMemCopy
+00:2de9 UnsafeMemSet
+00:2df1 SafeMemSet
+00:2df1 SafeMemSet.wvr_u2
+00:2dff SwitchToGameplay
+00:2e09 SwitchToGameplayBig
+00:2e13 GamePlayEventLoopHandler
+00:2e1d GamePlayBigEventLoopHandler
+00:2e27 CopyOAMHandler
+00:2e33 ClearOAM
+00:2e49 IntrInit
+00:2e4d InitializeLCDCInterrupt
+00:2e62 OAMDMA
+00:2e6c OAMDMAEnd
 01:4008 sDMGTSpeedCurve
 01:4210 sDMGTSpeedCurveEnd
 01:4212 sTGM1SpeedCurve
diff --git a/src/rng.asm b/src/rng.asm
index 6ed5116..0d6f36f 100644
--- a/src/rng.asm
+++ b/src/rng.asm
@@ -38,22 +38,25 @@ wTGM3WorstDroughtIdx: ds 1
 
 
 section "RNG Functions", ROM0
+HarvestEntropy::
+    ret
+
     ; Snapshots the initial seed for a game, then initializes the history and piece queue.
 RNGInit::
     ; Do some bit fuckery on the seed using the gameboy's free-running timers.
-    ldh a, [rDIV]
+    ld hl, rDIV
+    ldh a, [hRNGSeed]
     xor a, [hl]
     ldh [hRNGSeed], a
-
-    ldh a, [rTIMA]
-    xor a, [hl]
-    ldh [hRNGSeed+1], a
-
-    ldh a, [rDIV]
+    ldh a, [hRNGSeed+2]
     xor a, [hl]
     ldh [hRNGSeed+2], a
 
-    ldh a, [rTIMA]
+    ld hl, rTIMA
+    ldh a, [hRNGSeed+1]
+    xor a, [hl]
+    ldh [hRNGSeed+1], a
+    ldh a, [hRNGSeed+3]
     xor a, [hl]
     ldh [hRNGSeed+3], a