From 70eb2a4b6e9294380ddf6a58245ba6b58fe242c1 Mon Sep 17 00:00:00 2001
From: Randy Thiemann <randy.thiemann@student.pxl.be>
Date: Thu, 2 Nov 2023 19:24:28 +0100
Subject: [PATCH] Oopsie on SHIR grades.

---
 bin/DMGTRIS.GBC    | Bin 131072 -> 131072 bytes
 bin/DMGTRIS.map    | 218 ++++++++++++++++++++++-----------------------
 bin/DMGTRIS.pocket | Bin 131072 -> 131072 bytes
 bin/DMGTRIS.sym    | 176 ++++++++++++++++++------------------
 src/grading.asm    |   1 +
 5 files changed, 198 insertions(+), 197 deletions(-)

diff --git a/bin/DMGTRIS.GBC b/bin/DMGTRIS.GBC
index 97dde3b1c0324b7239c62eb1b7e247ac309f92b4..91d8185acd0cb70053eaea08dfd4c4add9872236 100644
GIT binary patch
delta 2043
zcma)+e{2(F7{~8fuU!kH;}$5lt-!t8dR-JjqZnk+6;|k2z!JufL<NRS6kJRc|3GC~
z4gQKo7^~2U7>l4JhB%>0_ZL~bAy?KnBdD99iyTo=_(M)nND66v?%G?AL=yhEyU#t(
z^FHs7=li_juss~Me^ml-BVvK&kd3c|pDnW_(FaP%Wg$#22n<b&E`XT+ErkKVe~#%T
z%pfo<mEuoWPg@ogMwDtJ(0WIN*r$Y&nI4+u2DFreg_IbpXGlk$bdbulnE8w@AOnNo
zXB-QK+dj)WjFZx0{P&4rh)<ok#sVAS&pZFoK5Z5HXN_yCZIUE%yPqbzD3mg|m?8IX
z7B~_)F1!Twkvh@>J0dTT%E|R&HYZF@W-A74taBc%k4K5C<i0btz~83$KA6L|^9H_}
z@!_j{xdo1Sw@?4OV@~juIU&o~#mH#w+jd@fG-Hirt0P<LmfHBMY|K|3IZ+qx@_6Zb
zo>qEkV;!}Nw82Y1uc5XoeaH2swr(}hFWjPyUV6Yox43D8oA%exfJk2Us5fm)$Z<tF
z;*qRgsoZPCUdWNX<IXQVQioI8RAFO>soj4~>hx%IX`HMFo32S4A}2j(7Ntb4rG+rN
zfSE*7qEye=V3=zO5+)3c1ugoLgmSK>-5kWVtTTQir^NY-a01&f?OUTyWgVtlT6IEO
z^;(U%)n0NT2NM`c5($$<Ww;pn3!<!}l#V~<{f<B3Cj(uQNMFSAH)TGc*(pL5Hx?kz
z^nw*DC32Sn<jn%}o3)kYFyK>Dz)@4c;{4JZG7&ly#JFPt(%uVYdZPXSd85F56*p+|
zl%F%X80y*A2hHqXqIBz<TTo`HlEl7X=6yQk9rA|Ap8?0}^(6Emu$VMTSl}Pl{f=1P
z?_8q!hx2}IV0U3)jqWHvkRRB=LT!a4@@3rOB_xzLic){#5DTw1G^Isy@GNwID~ByY
z!e_zF=;*Uwb<?ZUX_CZbP#IST3ZIL~q&ta!+A+suuE2>6et5?Lk;L!IV5tSt(b+42
zXVap(H~P>Dn2LrrG?Z!`$dI?9haQJ%iTx{}(@L-ydqiJWX`*?>u66l-Rf0;huUlD0
zKX%jY(MMXL%PomgXPY{@P_X)J%1ECw%FW$GW+k!ScrL@O;DYIi%dK#FB5aQy+Xw=C
zz$0}=&uxS$T^f1R>sb&c&{n_tlQM#-xW-LHmSKusE99?DJZ56m#B8z{&zl&RF`mb7
z;?+7=qN;F$=S+^Bc~0zXgHL95;h8t4V2p8Tci6pELc8^}qFAvg8h%kk+=yX4RYcsX
zVLe|&+^Ch=mQQiHXvRGo!I>iB?hUK6h<FZ$wPqZXcTq_cRnnMfdL5Q)Qt5sd>PuFk
zM!K^(S*zuZoMR#O+f6OwHr$rF_im1!|8r>SyhB}rHL9+H(r9xJ5Nvu*mdT_PCfEA>
zyi6(#9+Sy5gD=a(ZLlg6VsJ(#qQPvE+;6ZmNggzqPm;L?*CfgO0%z<g(wO+82b7X~
zQ2UjA(1krN9o>9~+Bde7!zo?un#<=<MrhDat&3EuoTKw+(CLYf_Cv7Dv%QwSHv?~E
zI$P*de)KWQh;OAbs%85-3*R2yjMsgkFY+BS^DtCtXS21Pw5AF&Mt;`BubFs{iE%x7
q*<*ad#6u>&XyWSyRw+I1Qh%U3rx8KsPUdKIcN<hEzCR2PJoO)W!yO0!

delta 2042
zcma)+e{2(F7{~8fukAWU;T9-mRJeCruS5|P#gGBF!3G@*SVH-csFNWR1ea*$KmHh5
z4gQKo94pYF7>f%bF_=lJ9)Ic58+fIAGlDuuv*2MAgg@jW0!bmQ&s}@#kx0THclWvH
zdEV#!@qC{*5-E>F%D*WCxEZy<8n~KR2N!Mgl7a|o$YUc+Kky9A2p)jA@pZxw;6KOo
z6J{6~mL?O=*iYG(7DqVs5oo<9LKsv-scaw3aYK5_;bKaRH8NzP&$`IWjF3G_my)4j
zXk=W=_`9NQGsejoA#r6=1QOFHZL~pK;$`>0`lr3h_-yp-bWBbP+};<+9tutd7nAn=
zX@i023BC&g(K^x^eTB@N8W3`MerhULHRNF3i)kRyPdsH0pRNV(U5f9+d3?KX;j0B7
zZ?%|T>RNpF)Xmoy1m9Q?vW;JiUZ{P)yn=r!Ymes^Mt9V$a#UPn<Kn_-qAt=?7ocrk
z>J3n_jyeTeAD~BTsH580?_8&&S8G1W-=SiF9`e)eKDxw5r5f5Kkk|a$Z3h!_U6lv?
zG8>TH0W&s}C%qHSul;hTTi#mbU`J_r<8`^)uhXRovL9}`F1JM`|4+-)0@vC~m_5Ku
zrfET*%Q#?^YYh@60*nnU#*+9cTx*9lh-=+!{ziWk>X+jLj!`<e(U{6UO1Fm%LffoO
zI&t9u$>gDek&^;pa;OUrLw`q943sm8`oL*#BHvIm)RPqGt62S}?0%Y?##eLW&E&;?
zuw$VF?ou;(x5(aY`qJ_k@TDc-m?dCEVeLz@QJM~7-0^18(GQhIqLa<!og#ayxnYZE
z%2|txp>+oap@r21Is4rmsI*llg~4F<W10@610nKvvui^e2^|6!lg0=O-X{#dD_-!s
zSL*)Jf?prlTO3$pIHr7B7}&`|ZB<h6R&py=l2E}Y$dYt~g*TTpWdw5g40M7gj~zlH
zXTZl8D3)LI(Q6OU6p1UKF`iD;Jr`F<ZwmkPbB-%qk)`Jw;R6@+Nmo|GDjQ^C^Vfox
z%?R4Q*yC$qIvU#1;M5zCA@9YGJPk9XgKJ^8onSHc3Sv%eq6Nur@`!(^LA6EfRaeu`
zeY7j~WEgsUNkQJ-uAN`T+eL>uHmIKG7HuW-Qdn?2m(ehIz$aY}!>LKo6+6BKc=nKA
z?v9<^0@HeQ@@qG8z*o?4qjo_Z!&F?uR-z~{&8QXfw-z3^ux4R4Rf_jo7?&}Tr_sV2
z44#Rq!U<loIJyfgb+^M8b9(U18%AK9@#t6BgH=Mm^z@?Gu_!uzRYKf|Y5k#uxK-17
zu7tQzJF}~h;&RE1dp3i!CB)sER(A>U987D?1g7qzk{GI_L27y%*632{{SfAstw)XY
z=JJYO%UgNZGVHh8dd6M2Ep6ZZ9DV=i(A9a5x_Em`TMy1yOCJzydQMTu<Pl7+_xU-6
zRGB=kkQpXlR*27JO(DeOtU?5n*%W!iWOs@@X0kU$7MWa=BK1YimXDAI>90Oe%N{`O
zR}VlB_PBg(+dXRE(m@7B47KYn(WQ>jU?a6J*Qk1y*3YIs>9d0ntn_!)(vN22l}zXJ
zgX*s$qmGH|)bo0_e{zsKwhiz5VqX+GWX=Fo>u0mGgM>$lGDhBE;kPXOiG^`J1=(Y~
nWZ|@hf3xt7B5RbM@Myo#?iqwvxbO2cwznN-Nk0$3qtE>ZGZ!4@

diff --git a/bin/DMGTRIS.map b/bin/DMGTRIS.map
index bf7297b..c166b4f 100644
--- a/bin/DMGTRIS.map
+++ b/bin/DMGTRIS.map
@@ -242,7 +242,7 @@ ROM0 bank #0:
 	         $1fcf = !3
 	         $1fe0 = !4
 	         $1fed = DoSpeedUp
-	SECTION: $202e-$21a2 ($0175 bytes) ["Grading Functions"]
+	SECTION: $202e-$21a3 ($0176 bytes) ["Grading Functions"]
 	         $202e = GradeInit
 	         $204f = GradeInit.notdeat
 	         $205d = GradeInit.notshir
@@ -259,113 +259,113 @@ ROM0 bank #0:
 	         $2119 = UpdateGradeDEAT.notm
 	         $2139 = UpdateGradeDEAT.disqualify
 	         $213f = UpdateGradeSHIR
-	         $217e = UpdateGradeSHIR.s5torikan
-	         $218e = UpdateGradeSHIR.s10torikan
-	         $219d = UpdateGradeSHIR.disqualify
-	SECTION: $21a3-$22a4 ($0102 bytes) ["Grading Data"]
-	         $21a3 = sTGM1GradeScores
-	         $21c5 = sTGM3InternalGradeSystem
-	         $2265 = sTGM3GradeBoosts
-	         $2284 = sTGM3LevelMultiplier
-	         $2288 = sTGM3BaselineCOOL
-	         $2291 = sTGM3REGRETConditions
-	SECTION: $22a5-$2371 ($00cd bytes) ["Input Functions"]
-	         $22a5 = InputInit
-	         $22b7 = GetInput
-	         $22b7 = GetInput.btns
-	         $22c4 = GetInput.readA
-	         $22c8 = GetInput.setA
-	         $22d3 = GetInput.clearA
-	         $22d6 = GetInput.readB
-	         $22da = GetInput.setB
-	         $22e5 = GetInput.clearB
-	         $22e8 = GetInput.readSelect
-	         $22ec = GetInput.setSelect
-	         $22f7 = GetInput.clearSelect
-	         $22fa = GetInput.readStart
-	         $22fe = GetInput.setStart
-	         $2309 = GetInput.clearStart
-	         $230c = GetInput.dpad
-	         $2319 = GetInput.readUp
-	         $231d = GetInput.setUp
-	         $2328 = GetInput.clearUp
-	         $232b = GetInput.readDown
-	         $232f = GetInput.setDown
-	         $233a = GetInput.clearDown
-	         $233d = GetInput.readLeft
-	         $2341 = GetInput.setLeft
-	         $234c = GetInput.clearLeft
-	         $234f = GetInput.readRight
-	         $2353 = GetInput.setRight
-	         $235e = GetInput.clearRight
-	         $2361 = GetInput.priorities
-	         $236c = GetInput.zero
-	SECTION: $2372-$243d ($00cc bytes) ["Score Functions"]
-	         $2372 = ScoreInit
-	         $2392 = IncreaseScore
-	         $23c6 = IncreaseScore.doConvert
-	         $23c8 = !0
-	         $23de = IncreaseScore.carry
-	         $23e0 = IncreaseScore.postConvert
-	         $23ed = !1
-	         $23f4 = IncreaseScore.preAddDigit
-	         $2414 = IncreaseScore.addDigit
-	         $242a = IncreaseScore.nextDigit
-	SECTION: $243e-$24f4 ($00b7 bytes) ["SRAM Functions"]
-	         $243e = RestoreSRAM
-	         $2497 = InitializeSRAM
-	SECTION: $24f5-$2598 ($00a4 bytes) ["Code Entry Point"]
-	         $24f5 = Main
-	         $250a = Main.wvr_u1
-	         $2513 = !0
-	         $2523 = Main.notgbc
-	         $2552 = Main.wvb_u2
-	         $2557 = !1
-	         $255d = EventLoop
-	         $2573 = EventLoop.eventloopjumps
-	         $257c = EventLoopPostHandler
-	         $257e = EventLoopPostHandler.wvb_u3
-	         $2590 = EventLoopPostHandler.vblankjumps
-	SECTION: $2599-$2606 ($006e bytes) ["Title Function Trampolines"]
-	         $2599 = SwitchToTitle
-	         $25a3 = TitleEventLoopHandler
-	         $25ad = TitleVBlankHandler
-	         $25b7 = DrawOption6
-	SECTION: $2607-$266f ($0069 bytes) ["Time Functions"]
-	         $2607 = TimeInit
-	         $261c = ResetGameTime
-	         $2627 = CheckTorikan
-	         $263e = CheckTorikan.failure
-	         $2640 = CheckTorikan.success
-	         $2643 = HandleTimers
-	SECTION: $2670-$26c1 ($0052 bytes) ["Tile Functions"]
-	         $2670 = LoadTitleTiles
-	         $268e = LoadGameplayTiles
-	         $26a4 = LoadGameplayTiles.gbc
-	         $26b3 = LoadGameplayTiles.dmg
-	SECTION: $26c2-$26ef ($002e bytes) ["Memory Functions"]
-	         $26c2 = UnsafeMemCopy
-	         $26cb = SafeMemCopy.wvr_u1
-	         $26cb = SafeMemCopy
-	         $26da = UnsafeMemSet
-	         $26e2 = SafeMemSet
-	         $26e2 = SafeMemSet.wvr_u2
-	SECTION: $26f0-$2717 ($0028 bytes) ["Gameplay Function Trampolines"]
-	         $26f0 = SwitchToGameplay
-	         $26fa = SwitchToGameplayBig
-	         $2704 = GamePlayEventLoopHandler
-	         $270e = GamePlayBigEventLoopHandler
-	SECTION: $2718-$2739 ($0022 bytes) ["OAM Functions"]
-	         $2718 = CopyOAMHandler
-	         $2724 = ClearOAM
-	SECTION: $273a-$2752 ($0019 bytes) ["Interrupt Initialization Functions"]
-	         $273a = IntrInit
-	         $273e = InitializeLCDCInterrupt
-	SECTION: $2753-$275c ($000a bytes) ["OAM DMA Code"]
-	         $2753 = OAMDMA
-	         $275d = OAMDMAEnd
-	EMPTY: $275d-$3fff ($18a3 bytes)
-	TOTAL EMPTY: $18ae bytes
+	         $217f = UpdateGradeSHIR.s5torikan
+	         $218f = UpdateGradeSHIR.s10torikan
+	         $219e = UpdateGradeSHIR.disqualify
+	SECTION: $21a4-$22a5 ($0102 bytes) ["Grading Data"]
+	         $21a4 = sTGM1GradeScores
+	         $21c6 = sTGM3InternalGradeSystem
+	         $2266 = sTGM3GradeBoosts
+	         $2285 = sTGM3LevelMultiplier
+	         $2289 = sTGM3BaselineCOOL
+	         $2292 = sTGM3REGRETConditions
+	SECTION: $22a6-$2372 ($00cd bytes) ["Input Functions"]
+	         $22a6 = InputInit
+	         $22b8 = GetInput
+	         $22b8 = GetInput.btns
+	         $22c5 = GetInput.readA
+	         $22c9 = GetInput.setA
+	         $22d4 = GetInput.clearA
+	         $22d7 = GetInput.readB
+	         $22db = GetInput.setB
+	         $22e6 = GetInput.clearB
+	         $22e9 = GetInput.readSelect
+	         $22ed = GetInput.setSelect
+	         $22f8 = GetInput.clearSelect
+	         $22fb = GetInput.readStart
+	         $22ff = GetInput.setStart
+	         $230a = GetInput.clearStart
+	         $230d = GetInput.dpad
+	         $231a = GetInput.readUp
+	         $231e = GetInput.setUp
+	         $2329 = GetInput.clearUp
+	         $232c = GetInput.readDown
+	         $2330 = GetInput.setDown
+	         $233b = GetInput.clearDown
+	         $233e = GetInput.readLeft
+	         $2342 = GetInput.setLeft
+	         $234d = GetInput.clearLeft
+	         $2350 = GetInput.readRight
+	         $2354 = GetInput.setRight
+	         $235f = GetInput.clearRight
+	         $2362 = GetInput.priorities
+	         $236d = GetInput.zero
+	SECTION: $2373-$243e ($00cc bytes) ["Score Functions"]
+	         $2373 = ScoreInit
+	         $2393 = IncreaseScore
+	         $23c7 = IncreaseScore.doConvert
+	         $23c9 = !0
+	         $23df = IncreaseScore.carry
+	         $23e1 = IncreaseScore.postConvert
+	         $23ee = !1
+	         $23f5 = IncreaseScore.preAddDigit
+	         $2415 = IncreaseScore.addDigit
+	         $242b = IncreaseScore.nextDigit
+	SECTION: $243f-$24f5 ($00b7 bytes) ["SRAM Functions"]
+	         $243f = RestoreSRAM
+	         $2498 = InitializeSRAM
+	SECTION: $24f6-$2599 ($00a4 bytes) ["Code Entry Point"]
+	         $24f6 = Main
+	         $250b = Main.wvr_u1
+	         $2514 = !0
+	         $2524 = Main.notgbc
+	         $2553 = Main.wvb_u2
+	         $2558 = !1
+	         $255e = EventLoop
+	         $2574 = EventLoop.eventloopjumps
+	         $257d = EventLoopPostHandler
+	         $257f = EventLoopPostHandler.wvb_u3
+	         $2591 = EventLoopPostHandler.vblankjumps
+	SECTION: $259a-$2607 ($006e bytes) ["Title Function Trampolines"]
+	         $259a = SwitchToTitle
+	         $25a4 = TitleEventLoopHandler
+	         $25ae = TitleVBlankHandler
+	         $25b8 = DrawOption6
+	SECTION: $2608-$2670 ($0069 bytes) ["Time Functions"]
+	         $2608 = TimeInit
+	         $261d = ResetGameTime
+	         $2628 = CheckTorikan
+	         $263f = CheckTorikan.failure
+	         $2641 = CheckTorikan.success
+	         $2644 = HandleTimers
+	SECTION: $2671-$26c2 ($0052 bytes) ["Tile Functions"]
+	         $2671 = LoadTitleTiles
+	         $268f = LoadGameplayTiles
+	         $26a5 = LoadGameplayTiles.gbc
+	         $26b4 = LoadGameplayTiles.dmg
+	SECTION: $26c3-$26f0 ($002e bytes) ["Memory Functions"]
+	         $26c3 = UnsafeMemCopy
+	         $26cc = SafeMemCopy.wvr_u1
+	         $26cc = SafeMemCopy
+	         $26db = UnsafeMemSet
+	         $26e3 = SafeMemSet
+	         $26e3 = SafeMemSet.wvr_u2
+	SECTION: $26f1-$2718 ($0028 bytes) ["Gameplay Function Trampolines"]
+	         $26f1 = SwitchToGameplay
+	         $26fb = SwitchToGameplayBig
+	         $2705 = GamePlayEventLoopHandler
+	         $270f = GamePlayBigEventLoopHandler
+	SECTION: $2719-$273a ($0022 bytes) ["OAM Functions"]
+	         $2719 = CopyOAMHandler
+	         $2725 = ClearOAM
+	SECTION: $273b-$2753 ($0019 bytes) ["Interrupt Initialization Functions"]
+	         $273b = IntrInit
+	         $273f = InitializeLCDCInterrupt
+	SECTION: $2754-$275d ($000a bytes) ["OAM DMA Code"]
+	         $2754 = OAMDMA
+	         $275e = OAMDMAEnd
+	EMPTY: $275e-$3fff ($18a2 bytes)
+	TOTAL EMPTY: $18ad bytes
 
 ROMX bank #1:
 	SECTION: $4000-$4007 ($0008 bytes) ["Bank ID BANK_OTHER"]
@@ -2368,7 +2368,7 @@ HRAM bank #0:
 	TOTAL EMPTY: $0006 bytes
 
 SUMMARY:
-	ROM0: 10066 bytes used / 6318 free
+	ROM0: 10067 bytes used / 6317 free
 	ROMX: 56500 bytes used / 41804 free in 6 banks
 	SRAM: 14 bytes used / 8178 free in 1 bank
 	WRAM0: 3494 bytes used / 602 free
diff --git a/bin/DMGTRIS.pocket b/bin/DMGTRIS.pocket
index 95b5873e742e3ce0531aca8b6d6ac7fca90b8fac..49e8a13e67223446c5470f92cda19483343c7874 100644
GIT binary patch
delta 2043
zcma)+e{2(F7{~8ff2@VkaSN1NDRA$$UKd5sC<YmHg%vs$W(ng*q5?xE3N9v!f1t9g
z27g5(j1}lajK!fOhB%>0_ZL~bAy?KnBdD99iyTow_(M)nND66v?%G?AL=yhEyU#t(
z^FHs7=li_juq_<6eO&@@Gh%`jup_<_elg7!1s}*Er-?8<z%w*0I00hXw-g2d|5>Jo
zFoVFDsThCCa@w@8Frri)f!4bsgg!Zx%yiQ%JD{c<ETqI(Ekio;w4GF@h0N!4AsHA1
zKVx6S-|?B&VVsy2;#VeyAwG5D8WU`Yzv%c!{j^qSpEb^{)=8qk?tYf+qEO1<Vuswm
zo8U;~IR6UNMrueC?1;QXDks+p*&IJPnXMSGnjQ0LZ9GbxB@djb2JQ~U_n{oV9XIjS
zh!5xT<rdoK-#Pv7j=90t=7vmT7bBz9@7g&2@r)&wbw#$+EVFXg%rT!Ua-t^O>G9I_
z9If=y`Wk8zXq}gSQAMpTZO65x)-EN`&)=r?UV6|&x43DYoAy`HfIwdLD7UOk$bMBk
z;t?%gvD~Z2UdWNX<Ib-<V!K1!RADs_Q=9*~*x^y>(l}WTHCz`rL{56nEKUh*Qxjo!
z0W*oF1hJN}!Z6zuBup3>6I!$-@#Sn&n=y!OTBrX;P6-PZ;{?`W+P6lV$}&v1v}lC3
z>1$PDS9{5Y986$DQ6NkfmEmOQuZWU{VmkhW_j~SypA2-00(}|F-;miyvr~8%I~E|%
z^?(H{C9szQ<n01;o7I)&FyJ#oz)?fMlKj%^G7&ly#JFPt($)iITB7~{d8@#jiybt0
z%Fh{G4E5~qgGTdTf_VGe+fZh5i9%m6^C2Db4tYc5&wzdPdJ_5w%$PJv%)mXW`R%d1
z-?3En59j^rz^=l;D$P-TFh8)}4Am8)z?HE}mXc83D2V-u!)AEBt|2XuLua8KoH=X}
z5<UxVMnj+NnwwsmL6amVfx<Z3QTS|3B3()RQ;#_&u?0?S@WXp{h$OBohh-*6N9QyH
zXHE;s-smIEFcl50Xed=XkRk6x4?hXh5(k>0!$PnadjwxrZlHO^u66o;lY?@juS;G|
zKXKFT(Z^b#(=7^ON2@Zrh`0Ex@<^XN%Ff$FW+$=UcrL>&;Di~8%PnwvB5aQy+X%e*
zphxV8p4$jhI#u#0H?qJ_pe=soXL$ruvGtpXB*7G|R><ENc+9|xfz8QcJZE5B#&{mT
zfmdr>iK@a0UNAUz<~gym6+WHSiDzD)f-%Oa-eLDw3H8=fi(<i|sQ6_OaU;6*R1tBj
zy7hb!aibPyTRz3*q8azB2WN_iyVtFbBH}sd)~az#-a{o(R7riJ;Z0bfN~P<4s4ZEA
z8tKaBB(;_|bM{5pZ@1Kp+i+XT-g`N^|IeYS^DcGqmZ-7{N~4Y4K(OgqNg|U{m|X4i
z^Af4hc}ybHbiOPRx6X=0h|U>_2s)dS<UySsN%FAHT$0SwxhhE(6gXo`k^00R-5{6T
zhuW|1hfeHq@#yBe)V{He^rkemt1h2i9-%=$wJcVse2y-dNoOQJJ^;Zo&-QBi!A!i7
z=^VaK{>jJ4BfgdLsG9BXEPQu#GhX+FzQ}jTtX^=bXS219w4@3$Mt<JFZy0!wfpI-~
q*<*adz(WSUXy6+KRwzC0RDPs8rx9LaPv&TJcPmU!{Ll*zJ@X$&0vvz<

delta 2042
zcma)+e{2(F7{~8fukAWU;T9-mRJeCruS5|fiXj7TgAF<su!Qm>Q76Mq5L}{}|M+8M
zHTWwUv8+OeVk|C%#9$_=di<qJZ{U^g%?Ros&4Pzf5dM&h2qcBHK6mYHM<NM-+}-D%
z=Xsy^$Mb#ONTfUxDgUMn;AYGQ>!2gK0WR7Wqy!PvkjF-te&89J6+8e5<LiVWz<-YE
zC(JM~EKMb!wx6;sFO6{OBhY$JgfOUv(z!mG=Z5r@!=;oMYh=jAo^g@cSs{0nE+<37
z(8#z}@OMSqR*aLgLh{O#2qb4t*=&Qh<V)^<^-p`1@!9Oz<(QfhxP8x)y%d}bE+*sq
z(*^^v6MQ!WVs)f7_A;40Js{)@{Pc9bYRJL5m(oD8pLoh1K3xmmyA<Dt3;1^5!dDAE
z-fFS1+_m)Xshh7Y3ckK5WE;O2yHNXHc?JJu&Ys9Gj_s^l<EXgCCd9?DWL>1UE<oG7
z)El5;9d!z{K0uGwP)D_~-}z2QRBJxT-=SiF9`e&2KDx|Dr5f5KkXQZMZ3h!_U6lv?
zG8>TH0W&sRAkhiu*M7OnEpM-Ku%ooR@w(jO*Xhy(*$+2em)l~J|EHB1fop9g%wAxo
z(u^R_XB;rfwFU_j0mg<FV@dopuC>z|#I<fUe`7xi^(%1#$0!}#Y)oYzr8~j~p>56<
zow#s-WD8Ki$SHv^dDMl6p}!+42FlrFec-e=S!k#k>P-ps6|8<!?h~4y!B=zR&E$oC
zuw$VF?ou;(r^Mb4eQ5;@_|g(^%o4Dwxb|ha7|jGR?szll?1xGt(aC1=c8R^!+_1$n
z?X1Pc(7FSI(86khocrz$RNAUj!eB7>5zPcLfe`t-*|n*Sgbo3VN#leC@8gEwl_>h%
zt9Acq(XS7TmIl@sj%lA32X?VgTa^;LmE5Y;BvdpCvLqd0;f-ZYS%Dlr16|-LV26;%
z8SpU%isjdQ^x8u-O%e)djHe5A&m|NRP2-<_&IyGpvGiOcyzhcO>B?GIV}opb;d=10
zSwY($U%Vb>qM;oPPQ3vc@^1XdQ!q<9xE}V{2^M3YAm-I3T9oV-kNAfgR9nQTx|V+K
zquuc*!qDqW3G$wH?feSfE;`h)LG?VhWII`q#)9LyjE2DjKIw88PECRC`0;JPvxoe0
zPyFmQn9-|~U%Qb9zJi7uwF~MPrs5j56Ged;My-&)weYxwH4C%p$#}1YaTybN8ZErZ
z;Mu4uoZv-^qo>GHPdj`uuNTj}VFbn*kA8(cSS9pJPcMoci=yLKlZYEJtv^g6Zq>A&
zn?&5Go!MPXae2~=dp3h}lZd-Ft?o(0b1<zn6PUh_O5&)J2C3;SSf@)R`T@)@+lU&8
z<_n5m%UcE43hcMrddA(jEp7k(9DV=i(A9a5x_EnB+X&8hOCJzydQMTu)DcXs_xU-6
zRGB=kkXa^QR*27JO(DeOoI(VX*)(~?WOtf8X0kU;mY7_VCiNxGm5-1H>90Oe%N{`O
zR}Vlh_PBhk;~uqd>m&mshT3(P=u*dMu#wtVYE(T->*rFR^w~iOR{FbZ>4$UiN~R0>
zLG@RWQOCp$>UlleKY2(U>%jZI)EC7LnKuB{`q}L2B;k>gjFER*_)QCcY++naQT7-w
nSvX_i-z<Ei#2Te1JlZd`XBOcV?)w6b?`wxS($53%=(GO;0NNa0

diff --git a/bin/DMGTRIS.sym b/bin/DMGTRIS.sym
index f3d3d9c..1887310 100644
--- a/bin/DMGTRIS.sym
+++ b/bin/DMGTRIS.sym
@@ -167,94 +167,94 @@
 00:2119 UpdateGradeDEAT.notm
 00:2139 UpdateGradeDEAT.disqualify
 00:213f UpdateGradeSHIR
-00:217e UpdateGradeSHIR.s5torikan
-00:218e UpdateGradeSHIR.s10torikan
-00:219d UpdateGradeSHIR.disqualify
-00:21a3 sTGM1GradeScores
-00:21c5 sTGM3InternalGradeSystem
-00:2265 sTGM3GradeBoosts
-00:2284 sTGM3LevelMultiplier
-00:2288 sTGM3BaselineCOOL
-00:2291 sTGM3REGRETConditions
-00:22a5 InputInit
-00:22b7 GetInput
-00:22b7 GetInput.btns
-00:22c4 GetInput.readA
-00:22c8 GetInput.setA
-00:22d3 GetInput.clearA
-00:22d6 GetInput.readB
-00:22da GetInput.setB
-00:22e5 GetInput.clearB
-00:22e8 GetInput.readSelect
-00:22ec GetInput.setSelect
-00:22f7 GetInput.clearSelect
-00:22fa GetInput.readStart
-00:22fe GetInput.setStart
-00:2309 GetInput.clearStart
-00:230c GetInput.dpad
-00:2319 GetInput.readUp
-00:231d GetInput.setUp
-00:2328 GetInput.clearUp
-00:232b GetInput.readDown
-00:232f GetInput.setDown
-00:233a GetInput.clearDown
-00:233d GetInput.readLeft
-00:2341 GetInput.setLeft
-00:234c GetInput.clearLeft
-00:234f GetInput.readRight
-00:2353 GetInput.setRight
-00:235e GetInput.clearRight
-00:2361 GetInput.priorities
-00:236c GetInput.zero
-00:2372 ScoreInit
-00:2392 IncreaseScore
-00:23c6 IncreaseScore.doConvert
-00:23de IncreaseScore.carry
-00:23e0 IncreaseScore.postConvert
-00:23f4 IncreaseScore.preAddDigit
-00:2414 IncreaseScore.addDigit
-00:242a IncreaseScore.nextDigit
-00:243e RestoreSRAM
-00:2497 InitializeSRAM
-00:24f5 Main
-00:250a Main.wvr_u1
-00:2523 Main.notgbc
-00:2552 Main.wvb_u2
-00:255d EventLoop
-00:2573 EventLoop.eventloopjumps
-00:257c EventLoopPostHandler
-00:257e EventLoopPostHandler.wvb_u3
-00:2590 EventLoopPostHandler.vblankjumps
-00:2599 SwitchToTitle
-00:25a3 TitleEventLoopHandler
-00:25ad TitleVBlankHandler
-00:25b7 DrawOption6
-00:2607 TimeInit
-00:261c ResetGameTime
-00:2627 CheckTorikan
-00:263e CheckTorikan.failure
-00:2640 CheckTorikan.success
-00:2643 HandleTimers
-00:2670 LoadTitleTiles
-00:268e LoadGameplayTiles
-00:26a4 LoadGameplayTiles.gbc
-00:26b3 LoadGameplayTiles.dmg
-00:26c2 UnsafeMemCopy
-00:26cb SafeMemCopy.wvr_u1
-00:26cb SafeMemCopy
-00:26da UnsafeMemSet
-00:26e2 SafeMemSet
-00:26e2 SafeMemSet.wvr_u2
-00:26f0 SwitchToGameplay
-00:26fa SwitchToGameplayBig
-00:2704 GamePlayEventLoopHandler
-00:270e GamePlayBigEventLoopHandler
-00:2718 CopyOAMHandler
-00:2724 ClearOAM
-00:273a IntrInit
-00:273e InitializeLCDCInterrupt
-00:2753 OAMDMA
-00:275d OAMDMAEnd
+00:217f UpdateGradeSHIR.s5torikan
+00:218f UpdateGradeSHIR.s10torikan
+00:219e UpdateGradeSHIR.disqualify
+00:21a4 sTGM1GradeScores
+00:21c6 sTGM3InternalGradeSystem
+00:2266 sTGM3GradeBoosts
+00:2285 sTGM3LevelMultiplier
+00:2289 sTGM3BaselineCOOL
+00:2292 sTGM3REGRETConditions
+00:22a6 InputInit
+00:22b8 GetInput
+00:22b8 GetInput.btns
+00:22c5 GetInput.readA
+00:22c9 GetInput.setA
+00:22d4 GetInput.clearA
+00:22d7 GetInput.readB
+00:22db GetInput.setB
+00:22e6 GetInput.clearB
+00:22e9 GetInput.readSelect
+00:22ed GetInput.setSelect
+00:22f8 GetInput.clearSelect
+00:22fb GetInput.readStart
+00:22ff GetInput.setStart
+00:230a GetInput.clearStart
+00:230d GetInput.dpad
+00:231a GetInput.readUp
+00:231e GetInput.setUp
+00:2329 GetInput.clearUp
+00:232c GetInput.readDown
+00:2330 GetInput.setDown
+00:233b GetInput.clearDown
+00:233e GetInput.readLeft
+00:2342 GetInput.setLeft
+00:234d GetInput.clearLeft
+00:2350 GetInput.readRight
+00:2354 GetInput.setRight
+00:235f GetInput.clearRight
+00:2362 GetInput.priorities
+00:236d GetInput.zero
+00:2373 ScoreInit
+00:2393 IncreaseScore
+00:23c7 IncreaseScore.doConvert
+00:23df IncreaseScore.carry
+00:23e1 IncreaseScore.postConvert
+00:23f5 IncreaseScore.preAddDigit
+00:2415 IncreaseScore.addDigit
+00:242b IncreaseScore.nextDigit
+00:243f RestoreSRAM
+00:2498 InitializeSRAM
+00:24f6 Main
+00:250b Main.wvr_u1
+00:2524 Main.notgbc
+00:2553 Main.wvb_u2
+00:255e EventLoop
+00:2574 EventLoop.eventloopjumps
+00:257d EventLoopPostHandler
+00:257f EventLoopPostHandler.wvb_u3
+00:2591 EventLoopPostHandler.vblankjumps
+00:259a SwitchToTitle
+00:25a4 TitleEventLoopHandler
+00:25ae TitleVBlankHandler
+00:25b8 DrawOption6
+00:2608 TimeInit
+00:261d ResetGameTime
+00:2628 CheckTorikan
+00:263f CheckTorikan.failure
+00:2641 CheckTorikan.success
+00:2644 HandleTimers
+00:2671 LoadTitleTiles
+00:268f LoadGameplayTiles
+00:26a5 LoadGameplayTiles.gbc
+00:26b4 LoadGameplayTiles.dmg
+00:26c3 UnsafeMemCopy
+00:26cc SafeMemCopy.wvr_u1
+00:26cc SafeMemCopy
+00:26db UnsafeMemSet
+00:26e3 SafeMemSet
+00:26e3 SafeMemSet.wvr_u2
+00:26f1 SwitchToGameplay
+00:26fb SwitchToGameplayBig
+00:2705 GamePlayEventLoopHandler
+00:270f GamePlayBigEventLoopHandler
+00:2719 CopyOAMHandler
+00:2725 ClearOAM
+00:273b IntrInit
+00:273f InitializeLCDCInterrupt
+00:2754 OAMDMA
+00:275e OAMDMAEnd
 01:4008 sDMGTSpeedCurve
 01:4210 sDMGTSpeedCurveEnd
 01:4212 sTGM1SpeedCurve
diff --git a/src/grading.asm b/src/grading.asm
index b5cde2d..afb1ca9 100644
--- a/src/grading.asm
+++ b/src/grading.asm
@@ -439,6 +439,7 @@ UpdateGradeSHIR:
     ld a, [wDisplayedGrade]
     cp a, b
     ret z ; If the grade is already correct, return.
+    ld a, b
     ld [wDisplayedGrade], a ; Otherwise, set the grade.
 
     ; Play the jingle.