From ae2711689a9664b269aa10a339c8452d322d2e34 Mon Sep 17 00:00:00 2001
From: Randy Thiemann <randy.thiemann@edt.zone>
Date: Fri, 3 Nov 2023 03:03:47 +0100
Subject: [PATCH] Expand score to 8 digits.

---
 bin/DMGTRIS.GBC         | Bin 131072 -> 131072 bytes
 bin/DMGTRIS.map         | 678 ++++++++++++++++++++--------------------
 bin/DMGTRIS.pocket      | Bin 131072 -> 131072 bytes
 bin/DMGTRIS.sym         | 496 ++++++++++++++---------------
 src/field.asm           |   1 -
 src/grading.asm         |  22 +-
 src/include/globals.asm |  20 +-
 src/score.asm           |  35 ++-
 src/sprites.asm         | 140 +++++++--
 src/state_gameplay.asm  |   4 +-
 10 files changed, 752 insertions(+), 644 deletions(-)

diff --git a/bin/DMGTRIS.GBC b/bin/DMGTRIS.GBC
index 350d854627624a8e44d8c60c95c245b1d12ebd6e..887121530a274f91400833ade7fbd90147b82a1e 100644
GIT binary patch
delta 7609
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

delta 7513
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
BN%sH%

diff --git a/bin/DMGTRIS.map b/bin/DMGTRIS.map
index 70f06f8..7c403ea 100644
--- a/bin/DMGTRIS.map
+++ b/bin/DMGTRIS.map
@@ -119,7 +119,7 @@ ROM0 bank #0:
 	         $1566 = !11
 	         $15b5 = !12
 	         $1604 = !13
-	SECTION: $1656-$1a21 ($03cc bytes) ["Domain Specific Functions"]
+	SECTION: $1656-$1a75 ($0420 bytes) ["Domain Specific Functions"]
 	         $1656 = ApplyTells
 	         $16b1 = ApplyNext
 	         $16e1 = ApplyNext.regular
@@ -134,269 +134,270 @@ ROM0 bank #0:
 	         $17d0 = ApplyHold.postoffsets
 	         $17d4 = ApplyHold.getoffh
 	         $17df = ApplyHold.skipoffh
-	         $1819 = ApplyNumbers6
-	         $1841 = ApplyNumbers4
-	         $185d = SetNumberSpritePositions
-	         $1944 = GradeRendering
-	         $1979 = GradeRendering.effect
-	         $1989 = GradeRendering.noeffect
-	         $1991 = GradeRendering.drawgrade
-	         $1998 = GradeRendering.regulargrade
-	         $19a0 = GradeRendering.sgrade
-	         $19b6 = GradeRendering.hisgrade
-	         $19cc = GradeRendering.mgrade
-	         $19e2 = GradeRendering.lettergrade
-	         $19ff = GradeRendering.mk
-	         $1a05 = GradeRendering.mv
-	         $1a0b = GradeRendering.mo
-	         $1a11 = GradeRendering.mm
-	         $1a17 = GradeRendering.gmgrade
-	SECTION: $1a22-$1d35 ($0314 bytes) ["Grading Functions"]
-	         $1a22 = GradeInit
-	         $1a4d = GradeInit.grade9start
-	         $1a52 = GradeInit.end
-	         $1a54 = UpdateGrade
-	         $1a62 = UpdateGrade.gradejumptable
-	         $1a74 = DecayGradeProcess
-	         $1a82 = DecayGradeProcess.gradejumptable
-	         $1a94 = DecayGradeDelay
-	         $1aa2 = DecayGradeDelay.gradejumptable
-	         $1ab4 = PrepareScore
-	         $1acb = UpdateGradeDMGT
-	         $1ae1 = UpdateGradeDMGT.clearrate
-	         $1af2 = UpdateGradeDMGT.combomult
-	         $1aff = UpdateGradeDMGT.combo10
-	         $1b10 = UpdateGradeDMGT.combo5
-	         $1b21 = UpdateGradeDMGT.combo1
-	         $1b30 = UpdateGradeDMGT.prelevel
-	         $1b3f = UpdateGradeDMGT.single
-	         $1b4f = UpdateGradeDMGT.double
-	         $1b60 = UpdateGradeDMGT.adddonce
-	         $1b64 = UpdateGradeDMGT.triple
-	         $1b75 = UpdateGradeDMGT.addtonce
-	         $1b79 = UpdateGradeDMGT.tetris
-	         $1b7d = UpdateGradeDMGT.levelmult
-	         $1b95 = UpdateGradeDMGT.mult5
-	         $1b9c = UpdateGradeDMGT.mult4
-	         $1ba2 = UpdateGradeDMGT.mult3
-	         $1ba7 = UpdateGradeDMGT.mult2
-	         $1bab = UpdateGradeDMGT.mult1
-	         $1bac = UpdateGradeDMGT.processgrade
-	         $1bd0 = UpdateGradeDMGT.increasegrademaybe
-	         $1bf1 = UpdateGradeDMGT.gotgm
-	         $1bfc = DecayGradeDMGT
-	         $1c1c = DecayGradeDMGT.nodecay
-	         $1c21 = DecayGradeDMGT.decay
-	         $1c2d = UpdateGradeTGM1
-	         $1c37 = UpdateGradeTGM1.trygradeup
-	         $1c51 = UpdateGradeTGM1.increasegrade
-	         $1c63 = UpdateGradeTGM1.skipjingle
-	         $1c70 = UpdateGradeTGM1.maybegm
-	         $1c86 = UpdateGradeDEAT
-	         $1c92 = UpdateGradeDEAT.notgm
-	         $1cab = UpdateGradeDEAT.notm
-	         $1ccb = UpdateGradeDEAT.disqualify
-	         $1cd1 = UpdateGradeSHIR
-	         $1d11 = UpdateGradeSHIR.s5torikan
-	         $1d21 = UpdateGradeSHIR.s10torikan
-	         $1d30 = UpdateGradeSHIR.disqualify
-	SECTION: $1d36-$1fcc ($0297 bytes) ["SFX Functions"]
-	         $1d36 = SFXInit
-	         $1d58 = SFXPopQueue
-	         $1d6d = SFXPushQueue
-	         $1d7e = SFXProcessQueue
-	         $1d8b = !0
-	         $1dac = SFXTriggerNoise
-	         $1db9 = !1
-	         $1dc6 = !2
-	         $1dd2 = SFXEnqueue
-	         $1de7 = SFXEnqueue.findsfx
-	         $1dfc = !3
-	         $1e0c = !4
-	         $1e1c = !5
-	         $1e2c = !6
-	         $1e3c = !7
-	         $1e4c = !8
-	         $1e5c = !9
-	         $1e6c = !10
-	         $1e7c = !11
-	         $1e8c = !12
-	         $1e9c = !13
-	         $1eac = !14
-	         $1ebc = !15
-	         $1ecc = !16
-	         $1edc = !17
-	         $1eeb = !18
-	         $1efa = !19
-	         $1f09 = !20
-	         $1f17 = !21
-	         $1f25 = !22
-	         $1f33 = !23
-	         $1f40 = SFXKill
-	         $1f6b = SFXPlayNoise
-	         $1f76 = SFXPlayNoise.noisereg
-	         $1f83 = !24
-	         $1f8d = SFXPlayNoise.savenoiseplayhead
-	         $1f96 = SFXPlay
-	         $1fa1 = !25
-	         $1fa4 = SFXPlay.play
-	         $1fb0 = SFXPlay.getRegister
-	         $1fba = !26
-	         $1fc4 = SFXPlay.savePlayhead
-	SECTION: $1fcd-$21ba ($01ee bytes) ["RNG Functions"]
-	         $1fcd = RNGInit
-	         $1ffd = !0
-	         $2018 = RNGInit.complexinit
-	         $202f = !1
-	         $2049 = ShiftHistory
-	         $2066 = GetNextHellPiece
-	         $206b = GetNextTGM1Piece
-	         $206e = !2
-	         $2086 = !3
-	         $2088 = GetNextTGM2Piece
-	         $208b = !4
-	         $20a3 = !5
-	         $20a5 = GetNextNesPiece
-	         $20b3 = GetNextTGM3Piece
-	         $20b6 = !6
-	         $20d9 = !7
-	         $20dc = !8
-	         $20ec = !9
-	         $20f6 = !10
-	         $2104 = !11
-	         $2113 = !12
-	         $211f = !13
-	         $212b = !14
-	         $2137 = !15
-	         $2143 = !16
-	         $214f = !17
-	         $215b = !18
-	         $216a = GetNextPiece
-	         $2178 = GetNextPiece.nextpiecejumps
-	         $2187 = Next35Piece
-	         $2187 = !19
-	         $2191 = Next7Piece
-	         $2191 = !20
-	         $219b = NextByte
-	SECTION: $21bb-$2370 ($01b6 bytes) ["Grading Data"]
-	         $21bb = sTGM1GradeScores
-	         $21dd = sTGM3InternalGradeSystem
-	         $227d = sTGM3GradeBoosts
-	         $229c = sTGM3LevelMultiplier
-	         $22a0 = sTGM3BaselineCOOL
-	         $22a9 = sTGM3REGRETConditions
-	         $22bd = sDMGTGrading
-	SECTION: $2371-$2513 ($01a3 bytes) ["Level Functions"]
-	         $2371 = LevelInit
-	         $23c1 = LevelUp
-	         $23e5 = LevelUp.doit
-	         $2429 = LevelUp.checknlevel
-	         $2457 = !0
-	         $246f = !1
-	         $2478 = LevelUp.bellmaybe
-	         $248a = LevelUp.leveljinglemaybe
-	         $2497 = LevelUp.checkspeedup
-	         $24a8 = !2
-	         $24b5 = !3
-	         $24c6 = !4
-	         $24d3 = DoSpeedUp
-	SECTION: $2514-$25e0 ($00cd bytes) ["Input Functions"]
-	         $2514 = InputInit
-	         $2526 = GetInput
-	         $2526 = GetInput.btns
-	         $2533 = GetInput.readA
-	         $2537 = GetInput.setA
-	         $2542 = GetInput.clearA
-	         $2545 = GetInput.readB
-	         $2549 = GetInput.setB
-	         $2554 = GetInput.clearB
-	         $2557 = GetInput.readSelect
-	         $255b = GetInput.setSelect
-	         $2566 = GetInput.clearSelect
-	         $2569 = GetInput.readStart
-	         $256d = GetInput.setStart
-	         $2578 = GetInput.clearStart
-	         $257b = GetInput.dpad
-	         $2588 = GetInput.readUp
-	         $258c = GetInput.setUp
-	         $2597 = GetInput.clearUp
-	         $259a = GetInput.readDown
-	         $259e = GetInput.setDown
-	         $25a9 = GetInput.clearDown
-	         $25ac = GetInput.readLeft
-	         $25b0 = GetInput.setLeft
-	         $25bb = GetInput.clearLeft
-	         $25be = GetInput.readRight
-	         $25c2 = GetInput.setRight
-	         $25cd = GetInput.clearRight
-	         $25d0 = GetInput.priorities
-	         $25db = GetInput.zero
-	SECTION: $25e1-$26ac ($00cc bytes) ["Score Functions"]
-	         $25e1 = ScoreInit
-	         $2601 = IncreaseScore
-	         $2635 = IncreaseScore.doConvert
-	         $2637 = !0
-	         $264d = IncreaseScore.carry
-	         $264f = IncreaseScore.postConvert
-	         $265c = !1
-	         $2663 = IncreaseScore.preAddDigit
-	         $2683 = IncreaseScore.addDigit
-	         $2699 = IncreaseScore.nextDigit
-	SECTION: $26ad-$2763 ($00b7 bytes) ["SRAM Functions"]
-	         $26ad = RestoreSRAM
-	         $2706 = InitializeSRAM
-	SECTION: $2764-$2807 ($00a4 bytes) ["Code Entry Point"]
-	         $2764 = Main
-	         $2779 = Main.wvr_u1
-	         $2782 = !0
-	         $2792 = Main.notgbc
-	         $27c1 = Main.wvb_u2
-	         $27c6 = !1
-	         $27cc = EventLoop
-	         $27e2 = EventLoop.eventloopjumps
-	         $27eb = EventLoopPostHandler
-	         $27ed = EventLoopPostHandler.wvb_u3
-	         $27ff = EventLoopPostHandler.vblankjumps
-	SECTION: $2808-$287b ($0074 bytes) ["Time Functions"]
-	         $2808 = TimeInit
-	         $281d = ResetGameTime
-	         $2828 = CheckTorikan
-	         $283f = CheckTorikan.failure
-	         $2841 = CheckTorikan.success
-	         $2844 = HandleTimers
-	SECTION: $287c-$28e9 ($006e bytes) ["Title Function Trampolines"]
-	         $287c = SwitchToTitle
-	         $2886 = TitleEventLoopHandler
-	         $2890 = TitleVBlankHandler
-	         $289a = DrawOption6
-	SECTION: $28ea-$293b ($0052 bytes) ["Tile Functions"]
-	         $28ea = LoadTitleTiles
-	         $2908 = LoadGameplayTiles
-	         $291e = LoadGameplayTiles.gbc
-	         $292d = LoadGameplayTiles.dmg
-	SECTION: $293c-$2969 ($002e bytes) ["Memory Functions"]
-	         $293c = UnsafeMemCopy
-	         $2945 = SafeMemCopy.wvr_u1
-	         $2945 = SafeMemCopy
-	         $2954 = UnsafeMemSet
-	         $295c = SafeMemSet
-	         $295c = SafeMemSet.wvr_u2
-	SECTION: $296a-$2991 ($0028 bytes) ["Gameplay Function Trampolines"]
-	         $296a = SwitchToGameplay
-	         $2974 = SwitchToGameplayBig
-	         $297e = GamePlayEventLoopHandler
-	         $2988 = GamePlayBigEventLoopHandler
-	SECTION: $2992-$29b3 ($0022 bytes) ["OAM Functions"]
-	         $2992 = CopyOAMHandler
-	         $299e = ClearOAM
-	SECTION: $29b4-$29cc ($0019 bytes) ["Interrupt Initialization Functions"]
-	         $29b4 = IntrInit
-	         $29b8 = InitializeLCDCInterrupt
-	SECTION: $29cd-$29d6 ($000a bytes) ["OAM DMA Code"]
-	         $29cd = OAMDMA
-	         $29d7 = OAMDMAEnd
-	EMPTY: $29d7-$3fff ($1629 bytes)
-	TOTAL EMPTY: $1634 bytes
+	         $1819 = ApplyNumbers8
+	         $184d = ApplyNumbers6
+	         $1875 = ApplyNumbers4
+	         $1891 = SetNumberSpritePositions
+	         $1998 = GradeRendering
+	         $19cd = GradeRendering.effect
+	         $19dd = GradeRendering.noeffect
+	         $19e5 = GradeRendering.drawgrade
+	         $19ec = GradeRendering.regulargrade
+	         $19f4 = GradeRendering.sgrade
+	         $1a0a = GradeRendering.hisgrade
+	         $1a20 = GradeRendering.mgrade
+	         $1a36 = GradeRendering.lettergrade
+	         $1a53 = GradeRendering.mk
+	         $1a59 = GradeRendering.mv
+	         $1a5f = GradeRendering.mo
+	         $1a65 = GradeRendering.mm
+	         $1a6b = GradeRendering.gmgrade
+	SECTION: $1a76-$1d85 ($0310 bytes) ["Grading Functions"]
+	         $1a76 = GradeInit
+	         $1aa1 = GradeInit.grade9start
+	         $1aa6 = GradeInit.end
+	         $1aa8 = UpdateGrade
+	         $1ab6 = UpdateGrade.gradejumptable
+	         $1ac8 = DecayGradeProcess
+	         $1ad6 = DecayGradeProcess.gradejumptable
+	         $1ae8 = DecayGradeDelay
+	         $1af6 = DecayGradeDelay.gradejumptable
+	         $1b08 = PrepareScore
+	         $1b1b = UpdateGradeDMGT
+	         $1b31 = UpdateGradeDMGT.clearrate
+	         $1b42 = UpdateGradeDMGT.combomult
+	         $1b4f = UpdateGradeDMGT.combo10
+	         $1b60 = UpdateGradeDMGT.combo5
+	         $1b71 = UpdateGradeDMGT.combo1
+	         $1b80 = UpdateGradeDMGT.prelevel
+	         $1b8f = UpdateGradeDMGT.single
+	         $1b9f = UpdateGradeDMGT.double
+	         $1bb0 = UpdateGradeDMGT.adddonce
+	         $1bb4 = UpdateGradeDMGT.triple
+	         $1bc5 = UpdateGradeDMGT.addtonce
+	         $1bc9 = UpdateGradeDMGT.tetris
+	         $1bcd = UpdateGradeDMGT.levelmult
+	         $1be5 = UpdateGradeDMGT.mult5
+	         $1bec = UpdateGradeDMGT.mult4
+	         $1bf2 = UpdateGradeDMGT.mult3
+	         $1bf7 = UpdateGradeDMGT.mult2
+	         $1bfb = UpdateGradeDMGT.mult1
+	         $1bfc = UpdateGradeDMGT.processgrade
+	         $1c20 = UpdateGradeDMGT.increasegrademaybe
+	         $1c41 = UpdateGradeDMGT.gotgm
+	         $1c4c = DecayGradeDMGT
+	         $1c6c = DecayGradeDMGT.nodecay
+	         $1c71 = DecayGradeDMGT.decay
+	         $1c7d = UpdateGradeTGM1
+	         $1c87 = UpdateGradeTGM1.trygradeup
+	         $1ca1 = UpdateGradeTGM1.increasegrade
+	         $1cb3 = UpdateGradeTGM1.skipjingle
+	         $1cc0 = UpdateGradeTGM1.maybegm
+	         $1cd6 = UpdateGradeDEAT
+	         $1ce2 = UpdateGradeDEAT.notgm
+	         $1cfb = UpdateGradeDEAT.notm
+	         $1d1b = UpdateGradeDEAT.disqualify
+	         $1d21 = UpdateGradeSHIR
+	         $1d61 = UpdateGradeSHIR.s5torikan
+	         $1d71 = UpdateGradeSHIR.s10torikan
+	         $1d80 = UpdateGradeSHIR.disqualify
+	SECTION: $1d86-$201c ($0297 bytes) ["SFX Functions"]
+	         $1d86 = SFXInit
+	         $1da8 = SFXPopQueue
+	         $1dbd = SFXPushQueue
+	         $1dce = SFXProcessQueue
+	         $1ddb = !0
+	         $1dfc = SFXTriggerNoise
+	         $1e09 = !1
+	         $1e16 = !2
+	         $1e22 = SFXEnqueue
+	         $1e37 = SFXEnqueue.findsfx
+	         $1e4c = !3
+	         $1e5c = !4
+	         $1e6c = !5
+	         $1e7c = !6
+	         $1e8c = !7
+	         $1e9c = !8
+	         $1eac = !9
+	         $1ebc = !10
+	         $1ecc = !11
+	         $1edc = !12
+	         $1eec = !13
+	         $1efc = !14
+	         $1f0c = !15
+	         $1f1c = !16
+	         $1f2c = !17
+	         $1f3b = !18
+	         $1f4a = !19
+	         $1f59 = !20
+	         $1f67 = !21
+	         $1f75 = !22
+	         $1f83 = !23
+	         $1f90 = SFXKill
+	         $1fbb = SFXPlayNoise
+	         $1fc6 = SFXPlayNoise.noisereg
+	         $1fd3 = !24
+	         $1fdd = SFXPlayNoise.savenoiseplayhead
+	         $1fe6 = SFXPlay
+	         $1ff1 = !25
+	         $1ff4 = SFXPlay.play
+	         $2000 = SFXPlay.getRegister
+	         $200a = !26
+	         $2014 = SFXPlay.savePlayhead
+	SECTION: $201d-$220a ($01ee bytes) ["RNG Functions"]
+	         $201d = RNGInit
+	         $204d = !0
+	         $2068 = RNGInit.complexinit
+	         $207f = !1
+	         $2099 = ShiftHistory
+	         $20b6 = GetNextHellPiece
+	         $20bb = GetNextTGM1Piece
+	         $20be = !2
+	         $20d6 = !3
+	         $20d8 = GetNextTGM2Piece
+	         $20db = !4
+	         $20f3 = !5
+	         $20f5 = GetNextNesPiece
+	         $2103 = GetNextTGM3Piece
+	         $2106 = !6
+	         $2129 = !7
+	         $212c = !8
+	         $213c = !9
+	         $2146 = !10
+	         $2154 = !11
+	         $2163 = !12
+	         $216f = !13
+	         $217b = !14
+	         $2187 = !15
+	         $2193 = !16
+	         $219f = !17
+	         $21ab = !18
+	         $21ba = GetNextPiece
+	         $21c8 = GetNextPiece.nextpiecejumps
+	         $21d7 = Next35Piece
+	         $21d7 = !19
+	         $21e1 = Next7Piece
+	         $21e1 = !20
+	         $21eb = NextByte
+	SECTION: $220b-$23c0 ($01b6 bytes) ["Grading Data"]
+	         $220b = sTGM1GradeScores
+	         $222d = sTGM3InternalGradeSystem
+	         $22cd = sTGM3GradeBoosts
+	         $22ec = sTGM3LevelMultiplier
+	         $22f0 = sTGM3BaselineCOOL
+	         $22f9 = sTGM3REGRETConditions
+	         $230d = sDMGTGrading
+	SECTION: $23c1-$2563 ($01a3 bytes) ["Level Functions"]
+	         $23c1 = LevelInit
+	         $2411 = LevelUp
+	         $2435 = LevelUp.doit
+	         $2479 = LevelUp.checknlevel
+	         $24a7 = !0
+	         $24bf = !1
+	         $24c8 = LevelUp.bellmaybe
+	         $24da = LevelUp.leveljinglemaybe
+	         $24e7 = LevelUp.checkspeedup
+	         $24f8 = !2
+	         $2505 = !3
+	         $2516 = !4
+	         $2523 = DoSpeedUp
+	SECTION: $2564-$2643 ($00e0 bytes) ["Score Functions"]
+	         $2564 = ScoreInit
+	         $258c = IncreaseScore
+	         $25c4 = IncreaseScore.doConvert
+	         $25c6 = !0
+	         $25dc = IncreaseScore.carry
+	         $25de = IncreaseScore.postConvert
+	         $25eb = !1
+	         $25f2 = IncreaseScore.preAddDigit
+	         $261a = IncreaseScore.addDigit
+	         $2630 = IncreaseScore.nextDigit
+	SECTION: $2644-$2710 ($00cd bytes) ["Input Functions"]
+	         $2644 = InputInit
+	         $2656 = GetInput
+	         $2656 = GetInput.btns
+	         $2663 = GetInput.readA
+	         $2667 = GetInput.setA
+	         $2672 = GetInput.clearA
+	         $2675 = GetInput.readB
+	         $2679 = GetInput.setB
+	         $2684 = GetInput.clearB
+	         $2687 = GetInput.readSelect
+	         $268b = GetInput.setSelect
+	         $2696 = GetInput.clearSelect
+	         $2699 = GetInput.readStart
+	         $269d = GetInput.setStart
+	         $26a8 = GetInput.clearStart
+	         $26ab = GetInput.dpad
+	         $26b8 = GetInput.readUp
+	         $26bc = GetInput.setUp
+	         $26c7 = GetInput.clearUp
+	         $26ca = GetInput.readDown
+	         $26ce = GetInput.setDown
+	         $26d9 = GetInput.clearDown
+	         $26dc = GetInput.readLeft
+	         $26e0 = GetInput.setLeft
+	         $26eb = GetInput.clearLeft
+	         $26ee = GetInput.readRight
+	         $26f2 = GetInput.setRight
+	         $26fd = GetInput.clearRight
+	         $2700 = GetInput.priorities
+	         $270b = GetInput.zero
+	SECTION: $2711-$27c7 ($00b7 bytes) ["SRAM Functions"]
+	         $2711 = RestoreSRAM
+	         $276a = InitializeSRAM
+	SECTION: $27c8-$286b ($00a4 bytes) ["Code Entry Point"]
+	         $27c8 = Main
+	         $27dd = Main.wvr_u1
+	         $27e6 = !0
+	         $27f6 = Main.notgbc
+	         $2825 = Main.wvb_u2
+	         $282a = !1
+	         $2830 = EventLoop
+	         $2846 = EventLoop.eventloopjumps
+	         $284f = EventLoopPostHandler
+	         $2851 = EventLoopPostHandler.wvb_u3
+	         $2863 = EventLoopPostHandler.vblankjumps
+	SECTION: $286c-$28df ($0074 bytes) ["Time Functions"]
+	         $286c = TimeInit
+	         $2881 = ResetGameTime
+	         $288c = CheckTorikan
+	         $28a3 = CheckTorikan.failure
+	         $28a5 = CheckTorikan.success
+	         $28a8 = HandleTimers
+	SECTION: $28e0-$294d ($006e bytes) ["Title Function Trampolines"]
+	         $28e0 = SwitchToTitle
+	         $28ea = TitleEventLoopHandler
+	         $28f4 = TitleVBlankHandler
+	         $28fe = DrawOption6
+	SECTION: $294e-$299f ($0052 bytes) ["Tile Functions"]
+	         $294e = LoadTitleTiles
+	         $296c = LoadGameplayTiles
+	         $2982 = LoadGameplayTiles.gbc
+	         $2991 = LoadGameplayTiles.dmg
+	SECTION: $29a0-$29cd ($002e bytes) ["Memory Functions"]
+	         $29a0 = UnsafeMemCopy
+	         $29a9 = SafeMemCopy.wvr_u1
+	         $29a9 = SafeMemCopy
+	         $29b8 = UnsafeMemSet
+	         $29c0 = SafeMemSet
+	         $29c0 = SafeMemSet.wvr_u2
+	SECTION: $29ce-$29f5 ($0028 bytes) ["Gameplay Function Trampolines"]
+	         $29ce = SwitchToGameplay
+	         $29d8 = SwitchToGameplayBig
+	         $29e2 = GamePlayEventLoopHandler
+	         $29ec = GamePlayBigEventLoopHandler
+	SECTION: $29f6-$2a17 ($0022 bytes) ["OAM Functions"]
+	         $29f6 = CopyOAMHandler
+	         $2a02 = ClearOAM
+	SECTION: $2a18-$2a30 ($0019 bytes) ["Interrupt Initialization Functions"]
+	         $2a18 = IntrInit
+	         $2a1c = InitializeLCDCInterrupt
+	SECTION: $2a31-$2a3a ($000a bytes) ["OAM DMA Code"]
+	         $2a31 = OAMDMA
+	         $2a3b = OAMDMAEnd
+	EMPTY: $2a3b-$3fff ($15c5 bytes)
+	TOTAL EMPTY: $15d0 bytes
 
 ROMX bank #1:
 	SECTION: $4000-$4007 ($0008 bytes) ["Bank ID BANK_OTHER"]
@@ -2232,32 +2233,32 @@ WRAM0 bank #0:
 	         $c82c = wSPRScore4
 	         $c830 = wSPRScore5
 	         $c834 = wSPRScore6
-	         $c838 = wSPRCLevel1
-	         $c83c = wSPRCLevel2
-	         $c840 = wSPRCLevel3
-	         $c844 = wSPRCLevel4
-	         $c848 = wSPRNLevel1
-	         $c84c = wSPRNLevel2
-	         $c850 = wSPRNLevel3
-	         $c854 = wSPRNLevel4
-	         $c858 = wSPRQueue1A
-	         $c85c = wSPRQueue1B
-	         $c860 = wSPRQueue2A
-	         $c864 = wSPRQueue2B
-	         $c868 = wSPRModeRNG
-	         $c86c = wSPRModeRot
-	         $c870 = wSPRModeDrop
-	         $c874 = wSPRModeHiG
-	         $c878 = wGrade0
-	         $c87c = wGrade1
-	         $c880 = wUnused0
-	         $c884 = wUnused1
-	         $c888 = wUnused2
-	         $c88c = wUnused3
-	         $c890 = wUnused4
-	         $c894 = wUnused5
-	         $c898 = wUnused6
-	         $c89c = wUnused7
+	         $c838 = wSPRScore7
+	         $c83c = wSPRScore8
+	         $c840 = wSPRCLevel1
+	         $c844 = wSPRCLevel2
+	         $c848 = wSPRCLevel3
+	         $c84c = wSPRCLevel4
+	         $c850 = wSPRNLevel1
+	         $c854 = wSPRNLevel2
+	         $c858 = wSPRNLevel3
+	         $c85c = wSPRNLevel4
+	         $c860 = wSPRQueue1A
+	         $c864 = wSPRQueue1B
+	         $c868 = wSPRQueue2A
+	         $c86c = wSPRQueue2B
+	         $c870 = wSPRModeRNG
+	         $c874 = wSPRModeRot
+	         $c878 = wSPRModeDrop
+	         $c87c = wSPRModeHiG
+	         $c880 = wSPRGrade1
+	         $c884 = wSPRGrade2
+	         $c888 = wUnused0
+	         $c88c = wUnused1
+	         $c890 = wUnused2
+	         $c894 = wUnused3
+	         $c898 = wUnused4
+	         $c89c = wUnused5
 	SECTION: $c8a0-$cd1e ($047f bytes) ["Field Variables"]
 	         $c8a0 = wField
 	         $c990 = wBackupField
@@ -2358,58 +2359,57 @@ HRAM bank #0:
 	         $ffab = hCLevel
 	         $ffaf = hNLevel
 	         $ffb5 = hPrevHundreds
-	SECTION: $ffb6-$ffc4 ($000f bytes) ["Score Variables"]
+	SECTION: $ffb6-$ffc7 ($0012 bytes) ["Score Variables"]
 	         $ffb6 = hScore
-	         $ffbc = hScoreIncrement
-	         $ffbe = hScoreIncrementBCD
-	         $ffc4 = hScoreIncrementHead
-	SECTION: $ffc5-$ffcf ($000b bytes) ["High RNG Variables"]
-	         $ffc5 = hRNGSeed
-	         $ffc9 = hPieceHistory
-	         $ffcd = hNextPiece
-	         $ffce = hUpcomingPiece1
-	         $ffcf = hUpcomingPiece2
-	SECTION: $ffd0-$ffd9 ($000a bytes) ["High Gameplay Variables"]
-	         $ffd0 = hCurrentPiece
-	         $ffd1 = hCurrentPieceX
-	         $ffd2 = hCurrentPieceY
-	         $ffd3 = hCurrentPieceRotationState
-	         $ffd4 = hHeldPiece
-	         $ffd5 = hHoldSpent
-	         $ffd6 = hMode
-	         $ffd7 = hModeCounter
-	         $ffd8 = hPrePause
-	         $ffd9 = hRequestedJingle
-	SECTION: $ffda-$ffe3 ($000a bytes) ["OAM DMA"]
-	         $ffda = hOAMDMA
-	         $ffe0 = !0
-	SECTION: $ffe4-$ffec ($0009 bytes) ["High SFX Variables"]
-	         $ffe4 = hPlayhead
-	         $ffe6 = hCurrentlyPlaying
-	         $ffe7 = hPlayQueue
-	         $ffeb = hNoisePlayhead
-	SECTION: $ffed-$fff4 ($0008 bytes) ["High Input Variables"]
-	         $ffed = hUpState
-	         $ffee = hDownState
-	         $ffef = hLeftState
-	         $fff0 = hRightState
-	         $fff1 = hAState
-	         $fff2 = hBState
-	         $fff3 = hStartState
-	         $fff4 = hSelectState
-	SECTION: $fff5-$fff6 ($0002 bytes) ["High Time Variables"]
-	         $fff5 = hFrameCtr
-	         $fff6 = hEvenFrame
-	SECTION: $fff7-$fff7 ($0001 byte) ["High Globals"]
-	         $fff7 = hGameState
-	SECTION: $fff8-$fff8 ($0001 byte) ["High Interrupt Variables"]
-	         $fff8 = hLCDCCtr
-	EMPTY: $fff9-$fffe ($0006 bytes)
-	TOTAL EMPTY: $0006 bytes
+	         $ffbe = hScoreIncrement
+	         $ffc0 = hScoreIncrementBCD
+	SECTION: $ffc8-$ffd2 ($000b bytes) ["High RNG Variables"]
+	         $ffc8 = hRNGSeed
+	         $ffcc = hPieceHistory
+	         $ffd0 = hNextPiece
+	         $ffd1 = hUpcomingPiece1
+	         $ffd2 = hUpcomingPiece2
+	SECTION: $ffd3-$ffdc ($000a bytes) ["High Gameplay Variables"]
+	         $ffd3 = hCurrentPiece
+	         $ffd4 = hCurrentPieceX
+	         $ffd5 = hCurrentPieceY
+	         $ffd6 = hCurrentPieceRotationState
+	         $ffd7 = hHeldPiece
+	         $ffd8 = hHoldSpent
+	         $ffd9 = hMode
+	         $ffda = hModeCounter
+	         $ffdb = hPrePause
+	         $ffdc = hRequestedJingle
+	SECTION: $ffdd-$ffe6 ($000a bytes) ["OAM DMA"]
+	         $ffdd = hOAMDMA
+	         $ffe3 = !0
+	SECTION: $ffe7-$ffef ($0009 bytes) ["High SFX Variables"]
+	         $ffe7 = hPlayhead
+	         $ffe9 = hCurrentlyPlaying
+	         $ffea = hPlayQueue
+	         $ffee = hNoisePlayhead
+	SECTION: $fff0-$fff7 ($0008 bytes) ["High Input Variables"]
+	         $fff0 = hUpState
+	         $fff1 = hDownState
+	         $fff2 = hLeftState
+	         $fff3 = hRightState
+	         $fff4 = hAState
+	         $fff5 = hBState
+	         $fff6 = hStartState
+	         $fff7 = hSelectState
+	SECTION: $fff8-$fff9 ($0002 bytes) ["High Time Variables"]
+	         $fff8 = hFrameCtr
+	         $fff9 = hEvenFrame
+	SECTION: $fffa-$fffa ($0001 byte) ["High Globals"]
+	         $fffa = hGameState
+	SECTION: $fffb-$fffb ($0001 byte) ["High Interrupt Variables"]
+	         $fffb = hLCDCCtr
+	EMPTY: $fffc-$fffe ($0003 bytes)
+	TOTAL EMPTY: $0003 bytes
 
 SUMMARY:
-	ROM0: 10700 bytes used / 5684 free
+	ROM0: 10800 bytes used / 5584 free
 	ROMX: 56508 bytes used / 41796 free in 6 banks
 	SRAM: 14 bytes used / 8178 free in 1 bank
 	WRAM0: 3503 bytes used / 593 free
-	HRAM: 121 bytes used / 6 free
+	HRAM: 124 bytes used / 3 free
diff --git a/bin/DMGTRIS.pocket b/bin/DMGTRIS.pocket
index 600b6a649ec455b023e0f856d7e13cd7fe5a3720..bef0f143e9a996952ff4dc068f1c0be52fff9e8c 100644
GIT binary patch
delta 7609
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

delta 7513
zcmcgw3wRV&maf~cq>~Wn2%+*KRq2pa<BQReMeP(F66k=sVI|5-lmH{Mh~jezis>LE
zAc_WBX$Bl8I?gxyt!O)on)qVDR;HS8%>xZMtIqX7kP?y$7?|nN>OHrrI_WU7&bN>G
zAYJD_uluZX{_ci`)P{!CS1brE4O-E4mdY=8&qAMBFY$V0M5?o`BDWn09Io+XBh;cl
zQ_x-n*u`xZx%Uuf!`|KV?eANsm=P%~0<^<CJYiBDjXj4o*It(LJu@Zv>KST0bRc-E
zb6if1C-yS-ihJKfKF(Ptd?#DyfNP}2v-?<j0}75wZ$<;bKaD5{ILe}n_gW5??p~33
z#>$?xS!b*Z4wlMg>d%$^Y3d60aX0(8U!fI#c}KJQ&x(4dqTZvZ4=Ax`@cu{C<x1?A
zc>f0VE+zIX-oHt`SBbUY{ZFd@qR2?SLy@iON=3G*_bD=`t_p^;i_y8@J7XsVwd|kP
z&Q;V~l>JV1k)kfu2WV_o=P7EfvOiT_sHi_v=m+WoMZHaFFWrB?I$!asw<@$lU81PV
z4Ao*#-L6C`bJU9zb*!T1DQcnO*Y~MT%Ase2!Lc5Fymi6r`TSrrZ%20rxAF4>^4L{u
zL3cNcla)!0?p1ELA5?YwQ$_E2*moYTH1SY|DrM4^<P6uJhi9FKYm`aBl{t1chp0SS
zty9!B`r@}VtE<^=Jj{0PK}D@sVozc%uFwIElk#HC7#^d`)MgxeNb&ZjoE@b;q^JRf
zPnE|S5_5M>O!dp@%@7>bvL<H9;~*30dz^mR+MsK*P3^@@o#mH140R!>51G!{gU-d$
zPh?(wFevBp;~=FhvJ`Tz{>kf~Sr7v*^}+jduPR@h8~YXZH#9i7YUlAtdv4^?e2$Ao
zn(`xEOb{O#X8$e^bjkn4=YwkQI4Sl<+#hR;xBtT{)v;C(UuU8}N`o4wZ%MHN`NemN
zf|ul-uyhv$bMp(wcNfSbVQZpt7EXw<Ane%ifLrq?RK1!D3*V5<-6p;z=1jP)eooz+
zM+EEYw~m0?t3HWouQp1u%cBx`K&`nH{`avL;~F|57lVtO6@g(p^W8;>vFI+%e#BwT
z%)yeR#f4FFA#-Cnf@2D%x=lBhYJ`yCuw>?&esD;89k$HLSPDK^kQX>cz9z?sN_xZO
zD{_>4Lrz5LF+cs99HYm{*Hk6P<v3C6qQg{mM2+hH^qAHsSa?79^y0Y%Fb}u!$TuEi
z^oPQiXz7AeewTbBFNXoN3;;)T5CAk{ul%KH@w2T^v@C^wwUQoP_L^j^<D2S8ZygLX
zf*g}m$yc(E9F1%%tkXCleHd;4ybSEunRW}{BEZv3{0QI*!2e`o1bBP^6cwgoEhusT
zSDV-hI34hG6R!jODc~DTYy<pyl6^hkQouE)-41vGV84kQ0Y3!zCKEdV2c88*m8oa~
z#lwK-=vYew*adKg0XG4x1vt-unE>wsxWIrTg*5ql1M&fF6rg(n-Aaz~_h?ywt_8FV
z&=RQUG6rxPfSdh+#D>dLh>K*yIp)Czk0v=}9LVP7(2qJwzgbC7EPG9HSUT$6nkJ<5
zhxO~C#U)2|z55IP_`~FzHRMD@;`D1_cUU`kD|nk{DOkaxN80)$^>9~MSODTqz?#><
zDj?4GGI^icUncvR^m`^L4ts}d<zjIWMs5y!J+7^b#dR2^Fu5OZ5j7<JS+ht3<U?o<
znpH>vo!SwPLMx1t1EifCWO`0=$QA~YA~d^niUgwIjF*d%<)WW{KrrnfAJmZ!3a%8Q
zDdYfEGzxM2XR`ga0%;70Vl=)-`qsTiqVRVD{=Vk-$tf2$zF@`(J6WD>x~qUUi0Y<m
zaCO)Zi*wfNIgdlGqwx1R{C$dN2(Z+jx|9CVPUgN2J6GW?!7A~-E9yj89@M6_Ygzfb
zLx^k?BD;mi?Ly=?0^TY1PSM;G&qbM(qNRW&D!WgLMHb7U;-IUzHsw&UQCL<NPhe&3
zH^o<u>@J|M`RT4UC`cn&F*#NoC_G8}NI#+E6gf@KkZ+^%D8f<mpTFG~JXqom%o5V+
zw{WPbUh*w(4U=!%=Yr;pp*h1eXJjEcj0K!D%qN-oq#n>`X!@9@ue}O<`VCD#)AYCd
zKtl};Wf}^I6YMn550w{^kUpqPuaj2NM&2NAlDEj)<Q=%ld&qx~y<{JGmqen&A$@x#
zeP@|#PaM%B_^J}bf5$$biNj~+S@@`eKR#EEd!3WNdw-zra{ubftF52hP;$z-FYBUc
zdQ^Nn9xhttniGjTI62-X*lc<HpDBz(VKfS3QW%-S_+hfgF8xt_EAEQKZMoI;YgcJ$
zlQU#{o0L-DlXgYDw<zyoK*E>wbuH}(EW$V%S82{jPAH4nTC~x^q?o-$D+yj*TAt3S
z))wgHwidZ0*jU;Sc-Dg#@_4HUzf^)#CH$%fj~<UF73j=FN^vyP$~NIIxXpvtNO)Tz
zzM~MAjK`Id_(dr_XEe_yDN^r=Z1g02{}31BgT`hlvLZ85n-wMwa+VCJFJg5UR$s!h
zouov=>Wjhk()hFiFB#}X<Sgw8?v}2~{-)Gn>%gD;`Xh$)Ohtd>U};d37M4%*xMt22
zxpjyefv0)k)pwu{*G#|2H6YFk8hzTrNY~7z$xg1Ba}qH4jOUtZkk-+GTW`__uy^3Q
zX6q8@+&44Hg+1aQ;wX)acs(Mg0UOTd@GT%Jx(FmSO#ZYxZ^F?r!C4cQ{<}}y8}NFt
zDuqc!?AI9fJJ<C|rTDY$$gY>3&nv}7Q|6bj8OFik`6P$mCOJ$smT+zCdED*?zg?B$
z((NciPt;Z^t~X^q*Y#eK<<`z56NmLfmGg+7RFN6@J|uJGTv&Y>%a4+O#J)ng58hDo
zxE!2*!cpvV(ldT~s+yjD<#!qq(%`M+4lMUX?)T7>PituGHGQCU0cqD9lHCi*;P~JJ
z-ZOMyUb!}Eat0mfwL&Si;d$jzc)iep@l!#aP6t}65o)vKdOcx3l%4j{_R?yxuhLnw
zP^|t1vcb|qq7Cs^>UL*~Vb7e#>>Y-k1^&tmEYb}lcNl>yY{;GE_3#<4snf)2L+Od^
zXnoFx)?8ar;}M@ZfL5UFIDAPF8xEj+P8Vf|nvc~292Hv>M7iu0aHOslMQn}&Vu#+M
zxJ)^;$cL^#ouQx)iRe)4g0<*Il(xl(cl&6!pLT^@Q&B~LN%(DF%|hJo!yV;}3Lhey
zp?&0p$)SYnc@CSQ1?57!xv<>|cI$=g(3b`yLx-lKMw>pJTPlzT-5+YIK$p$$CXeIQ
zJ~k7&9g1BF6tL})*QUe4BB*>HY4N?Wovg>%=qcVpPlMJ;H+y@nWHX<Wu$%_VDGj~*
zlj(GG88aEH&a7m+5t>+ua$#?-t3+2A!>_GGLP3|8bkWVm^x)<|td~3;feiW#_f(?d
zOS;N_*ag0!8H06d4xx&6m$5C*oQ8zd?lRKNl7{|s8p_M<)Hr=g?fwG;)99lH8uZRj
z7u*n=6yWGCOQg!r5Eg+k*=lDK^M+vZ<BG?E^h5KfUF0#^#g3HrhsvfSo`)MQWq@L~
zpYE)#dt>r-^f52^bcgPo4!hD7x@-f=6T8|bJHl|;cv~3mTUZ^3@tg`c^^FwjvUCGI
z8Ct#pO&-(TK)S=E5l*N{9)WiiL}Gs07jpU0qyRJVsq|4lHJqC0;~=)dsXa>?X}9<M
zt9RfWqt#7pvmbAh(rF*-b8-eGWg>h%dlqXJ!2v!y_{nS*!lht9QYk-y?f{2k=&qbF
z4&G}{;3*BQ*oZDgyFxoQqTHgha7Xgk_>VTQVLRB3|H3EV;XnG(=Uw=-skAdRu?o43
zyD+B;t-HR{F|mPch|*4nY(A%%&+E<SZ1XwaeAcojekzwuK(cyCKkL*?prMi(Xr*PJ
zJLKDhZcKT54S5Hnk`SGNaz?@8eo3Byukd*o*ZOcxC}$?hPv7UJm~=9l=4<uML<1HZ
z{QS@y5^g|aP)(@%2E;SPR;CzjiPW^Ny#ej8&xKN+>X9{4VU$sPbGG~ytE6%>)KXlC
zKOc|papP1UF3Js)kD#>n$g{{{ywnaa>p3~9SJ?B4t5`Ri_Jr=6jfw+@wOK+MtHCa)
z!Srw$oP-rJNaV2V@>=ndD0Cg5sFB7+%x0Gzq$doftB09nC+Wem4_0cf4;M%f0Y~~V
z^wlm%2$$&)`G}Qp$&Pm~;^%|o$LyUBa8d@m>YT)Q`e{B5UT#jx0{IjxH5B{hhF8eP
z{KdxmpP`$X>nU($Va)Y3t6GDuoSXr(DVhr8Dn;f=51YtH(!=VD<fI?Nr<JYr3|yT|
zJmYpB?IA~?H8DTDzCtfXyzZQpG<TRYOG_K!&4zqgx_ctWuoSKt^a;ZWHihMMOcnPi
zt+fl#Q`Xie=c1gHKo6`UO(?kV*+CdAE)7NkmIM9Y*c5%e8TuYNOg&pf8otR#kLY8$
zDr!YVL8JBN4Dzc<@+X6GpjM=VpjNa+hXVK{8IFE1kuOQENs@n_B(E`Lit+EV>4$jD
zSW!@1ug7r?4?h*TUX0^%UaV4F;Q*5u$-6l_^0X7q@1w-wUhp2U`?(2Djh~coW!K~f
z@4=vJI+M~M2(BLe&`&$bhjpYg8s}Q8UqCZa>&nIG<$?gT;VB2vCtNoBVexNk&g`d1
z)~D^zr<wR~Ln3T=Lc3>3gd<64yN5(L5IeWrNYOi_hNDS1$A&~Wq=YteNQC1`Xp08L
z=#LPGtJfxo!(3z(#@0tr#dy|o@ZxePpih_M2jJ})Mj7Un8_lwC9UALA1cb_fQvkXL
z;qY*s5F{K|uS*aD%X*y<T(TZrwvZ8m!t(P7!2<vPh!7keMhIXkAy*|D6FRsaIrH@y
zvd({4@BD|SSF^ruIRG)8p;PM<WZ}6c=(jo0Z%r-$lTQxPmkif#a#_gLgbLEY(_{^y
z=0=p0o=g$IAwSgFh-^bVVQrJi6WC0FC+wWA^8`Q!Pk@lZ;ob?7z(z|?<_Ij6ada(B
zNGuv62+1@4D}r$4g$RP5J~r&=;1`)V5Ci%cF-QY&hnX8tA-WJZXsI%}f%|XZ2BA?K
z(HQ^Vfebvr?()X+1Q~$Ru9E>FC2NLpdB5L?n*MM3K*ys$zz2S@3FTd#%m-4+aZN7!
zNmj5y<9dodQASwDSau`*S7=W5aR?{zgb?tAlGckJLoXqq2>Tv~uO&bcw!rJjdh^-1
zvkbnyonvKSIn*M$^@j`wlPI%?W^6?gd^2<@ia6pR#IWC?x)m`iA%CKXV-s?(BIYM#
zs)%AjjwxbELbgT4ixYBYRGgTQ`KWkRLN1Dm*O+oF^`JPVm2O4E^1mQ8jti2SOK%2J
zBW?TdNzJ^a;;#>yq$a#%7^zt@%%qc=89tm+o<wTGOQ2tU4AkVWNX@59{{KmhGDK=%
zA{Qhz{Yj)IyaZ3E97bw}=8ivIGDvD5ACMZ8(ew{78i;?>U^L*t7!4?PO~uP@gto~@
zO_ok-vQt{`z6se-Kpq20evI9~wlj7EnSPwzIPqU}cEi`X?p(@RwZTb1o}DBwGvxqt
zdML^8WReWWJ{a7ZB)2EYe@v3knDUPjnjt<Dh#Z63`S&I?aW1ZX{~i3(TIaohe!Jkm
E003=D_5c6?

diff --git a/bin/DMGTRIS.sym b/bin/DMGTRIS.sym
index d008041..3718f0b 100644
--- a/bin/DMGTRIS.sym
+++ b/bin/DMGTRIS.sym
@@ -99,193 +99,194 @@
 00:17d0 ApplyHold.postoffsets
 00:17d4 ApplyHold.getoffh
 00:17df ApplyHold.skipoffh
-00:1819 ApplyNumbers6
-00:1841 ApplyNumbers4
-00:185d SetNumberSpritePositions
-00:1944 GradeRendering
-00:1979 GradeRendering.effect
-00:1989 GradeRendering.noeffect
-00:1991 GradeRendering.drawgrade
-00:1998 GradeRendering.regulargrade
-00:19a0 GradeRendering.sgrade
-00:19b6 GradeRendering.hisgrade
-00:19cc GradeRendering.mgrade
-00:19e2 GradeRendering.lettergrade
-00:19ff GradeRendering.mk
-00:1a05 GradeRendering.mv
-00:1a0b GradeRendering.mo
-00:1a11 GradeRendering.mm
-00:1a17 GradeRendering.gmgrade
-00:1a22 GradeInit
-00:1a4d GradeInit.grade9start
-00:1a52 GradeInit.end
-00:1a54 UpdateGrade
-00:1a62 UpdateGrade.gradejumptable
-00:1a74 DecayGradeProcess
-00:1a82 DecayGradeProcess.gradejumptable
-00:1a94 DecayGradeDelay
-00:1aa2 DecayGradeDelay.gradejumptable
-00:1ab4 PrepareScore
-00:1acb UpdateGradeDMGT
-00:1ae1 UpdateGradeDMGT.clearrate
-00:1af2 UpdateGradeDMGT.combomult
-00:1aff UpdateGradeDMGT.combo10
-00:1b10 UpdateGradeDMGT.combo5
-00:1b21 UpdateGradeDMGT.combo1
-00:1b30 UpdateGradeDMGT.prelevel
-00:1b3f UpdateGradeDMGT.single
-00:1b4f UpdateGradeDMGT.double
-00:1b60 UpdateGradeDMGT.adddonce
-00:1b64 UpdateGradeDMGT.triple
-00:1b75 UpdateGradeDMGT.addtonce
-00:1b79 UpdateGradeDMGT.tetris
-00:1b7d UpdateGradeDMGT.levelmult
-00:1b95 UpdateGradeDMGT.mult5
-00:1b9c UpdateGradeDMGT.mult4
-00:1ba2 UpdateGradeDMGT.mult3
-00:1ba7 UpdateGradeDMGT.mult2
-00:1bab UpdateGradeDMGT.mult1
-00:1bac UpdateGradeDMGT.processgrade
-00:1bd0 UpdateGradeDMGT.increasegrademaybe
-00:1bf1 UpdateGradeDMGT.gotgm
-00:1bfc DecayGradeDMGT
-00:1c1c DecayGradeDMGT.nodecay
-00:1c21 DecayGradeDMGT.decay
-00:1c2d UpdateGradeTGM1
-00:1c37 UpdateGradeTGM1.trygradeup
-00:1c51 UpdateGradeTGM1.increasegrade
-00:1c63 UpdateGradeTGM1.skipjingle
-00:1c70 UpdateGradeTGM1.maybegm
-00:1c86 UpdateGradeDEAT
-00:1c92 UpdateGradeDEAT.notgm
-00:1cab UpdateGradeDEAT.notm
-00:1ccb UpdateGradeDEAT.disqualify
-00:1cd1 UpdateGradeSHIR
-00:1d11 UpdateGradeSHIR.s5torikan
-00:1d21 UpdateGradeSHIR.s10torikan
-00:1d30 UpdateGradeSHIR.disqualify
-00:1d36 SFXInit
-00:1d58 SFXPopQueue
-00:1d6d SFXPushQueue
-00:1d7e SFXProcessQueue
-00:1dac SFXTriggerNoise
-00:1dd2 SFXEnqueue
-00:1de7 SFXEnqueue.findsfx
-00:1f40 SFXKill
-00:1f6b SFXPlayNoise
-00:1f76 SFXPlayNoise.noisereg
-00:1f8d SFXPlayNoise.savenoiseplayhead
-00:1f96 SFXPlay
-00:1fa4 SFXPlay.play
-00:1fb0 SFXPlay.getRegister
-00:1fc4 SFXPlay.savePlayhead
-00:1fcd RNGInit
-00:2018 RNGInit.complexinit
-00:2049 ShiftHistory
-00:2066 GetNextHellPiece
-00:206b GetNextTGM1Piece
-00:2088 GetNextTGM2Piece
-00:20a5 GetNextNesPiece
-00:20b3 GetNextTGM3Piece
-00:216a GetNextPiece
-00:2178 GetNextPiece.nextpiecejumps
-00:2187 Next35Piece
-00:2191 Next7Piece
-00:219b NextByte
-00:21bb sTGM1GradeScores
-00:21dd sTGM3InternalGradeSystem
-00:227d sTGM3GradeBoosts
-00:229c sTGM3LevelMultiplier
-00:22a0 sTGM3BaselineCOOL
-00:22a9 sTGM3REGRETConditions
-00:22bd sDMGTGrading
-00:2371 LevelInit
-00:23c1 LevelUp
-00:23e5 LevelUp.doit
-00:2429 LevelUp.checknlevel
-00:2478 LevelUp.bellmaybe
-00:248a LevelUp.leveljinglemaybe
-00:2497 LevelUp.checkspeedup
-00:24d3 DoSpeedUp
-00:2514 InputInit
-00:2526 GetInput
-00:2526 GetInput.btns
-00:2533 GetInput.readA
-00:2537 GetInput.setA
-00:2542 GetInput.clearA
-00:2545 GetInput.readB
-00:2549 GetInput.setB
-00:2554 GetInput.clearB
-00:2557 GetInput.readSelect
-00:255b GetInput.setSelect
-00:2566 GetInput.clearSelect
-00:2569 GetInput.readStart
-00:256d GetInput.setStart
-00:2578 GetInput.clearStart
-00:257b GetInput.dpad
-00:2588 GetInput.readUp
-00:258c GetInput.setUp
-00:2597 GetInput.clearUp
-00:259a GetInput.readDown
-00:259e GetInput.setDown
-00:25a9 GetInput.clearDown
-00:25ac GetInput.readLeft
-00:25b0 GetInput.setLeft
-00:25bb GetInput.clearLeft
-00:25be GetInput.readRight
-00:25c2 GetInput.setRight
-00:25cd GetInput.clearRight
-00:25d0 GetInput.priorities
-00:25db GetInput.zero
-00:25e1 ScoreInit
-00:2601 IncreaseScore
-00:2635 IncreaseScore.doConvert
-00:264d IncreaseScore.carry
-00:264f IncreaseScore.postConvert
-00:2663 IncreaseScore.preAddDigit
-00:2683 IncreaseScore.addDigit
-00:2699 IncreaseScore.nextDigit
-00:26ad RestoreSRAM
-00:2706 InitializeSRAM
-00:2764 Main
-00:2779 Main.wvr_u1
-00:2792 Main.notgbc
-00:27c1 Main.wvb_u2
-00:27cc EventLoop
-00:27e2 EventLoop.eventloopjumps
-00:27eb EventLoopPostHandler
-00:27ed EventLoopPostHandler.wvb_u3
-00:27ff EventLoopPostHandler.vblankjumps
-00:2808 TimeInit
-00:281d ResetGameTime
-00:2828 CheckTorikan
-00:283f CheckTorikan.failure
-00:2841 CheckTorikan.success
-00:2844 HandleTimers
-00:287c SwitchToTitle
-00:2886 TitleEventLoopHandler
-00:2890 TitleVBlankHandler
-00:289a DrawOption6
-00:28ea LoadTitleTiles
-00:2908 LoadGameplayTiles
-00:291e LoadGameplayTiles.gbc
-00:292d LoadGameplayTiles.dmg
-00:293c UnsafeMemCopy
-00:2945 SafeMemCopy.wvr_u1
-00:2945 SafeMemCopy
-00:2954 UnsafeMemSet
-00:295c SafeMemSet
-00:295c SafeMemSet.wvr_u2
-00:296a SwitchToGameplay
-00:2974 SwitchToGameplayBig
-00:297e GamePlayEventLoopHandler
-00:2988 GamePlayBigEventLoopHandler
-00:2992 CopyOAMHandler
-00:299e ClearOAM
-00:29b4 IntrInit
-00:29b8 InitializeLCDCInterrupt
-00:29cd OAMDMA
-00:29d7 OAMDMAEnd
+00:1819 ApplyNumbers8
+00:184d ApplyNumbers6
+00:1875 ApplyNumbers4
+00:1891 SetNumberSpritePositions
+00:1998 GradeRendering
+00:19cd GradeRendering.effect
+00:19dd GradeRendering.noeffect
+00:19e5 GradeRendering.drawgrade
+00:19ec GradeRendering.regulargrade
+00:19f4 GradeRendering.sgrade
+00:1a0a GradeRendering.hisgrade
+00:1a20 GradeRendering.mgrade
+00:1a36 GradeRendering.lettergrade
+00:1a53 GradeRendering.mk
+00:1a59 GradeRendering.mv
+00:1a5f GradeRendering.mo
+00:1a65 GradeRendering.mm
+00:1a6b GradeRendering.gmgrade
+00:1a76 GradeInit
+00:1aa1 GradeInit.grade9start
+00:1aa6 GradeInit.end
+00:1aa8 UpdateGrade
+00:1ab6 UpdateGrade.gradejumptable
+00:1ac8 DecayGradeProcess
+00:1ad6 DecayGradeProcess.gradejumptable
+00:1ae8 DecayGradeDelay
+00:1af6 DecayGradeDelay.gradejumptable
+00:1b08 PrepareScore
+00:1b1b UpdateGradeDMGT
+00:1b31 UpdateGradeDMGT.clearrate
+00:1b42 UpdateGradeDMGT.combomult
+00:1b4f UpdateGradeDMGT.combo10
+00:1b60 UpdateGradeDMGT.combo5
+00:1b71 UpdateGradeDMGT.combo1
+00:1b80 UpdateGradeDMGT.prelevel
+00:1b8f UpdateGradeDMGT.single
+00:1b9f UpdateGradeDMGT.double
+00:1bb0 UpdateGradeDMGT.adddonce
+00:1bb4 UpdateGradeDMGT.triple
+00:1bc5 UpdateGradeDMGT.addtonce
+00:1bc9 UpdateGradeDMGT.tetris
+00:1bcd UpdateGradeDMGT.levelmult
+00:1be5 UpdateGradeDMGT.mult5
+00:1bec UpdateGradeDMGT.mult4
+00:1bf2 UpdateGradeDMGT.mult3
+00:1bf7 UpdateGradeDMGT.mult2
+00:1bfb UpdateGradeDMGT.mult1
+00:1bfc UpdateGradeDMGT.processgrade
+00:1c20 UpdateGradeDMGT.increasegrademaybe
+00:1c41 UpdateGradeDMGT.gotgm
+00:1c4c DecayGradeDMGT
+00:1c6c DecayGradeDMGT.nodecay
+00:1c71 DecayGradeDMGT.decay
+00:1c7d UpdateGradeTGM1
+00:1c87 UpdateGradeTGM1.trygradeup
+00:1ca1 UpdateGradeTGM1.increasegrade
+00:1cb3 UpdateGradeTGM1.skipjingle
+00:1cc0 UpdateGradeTGM1.maybegm
+00:1cd6 UpdateGradeDEAT
+00:1ce2 UpdateGradeDEAT.notgm
+00:1cfb UpdateGradeDEAT.notm
+00:1d1b UpdateGradeDEAT.disqualify
+00:1d21 UpdateGradeSHIR
+00:1d61 UpdateGradeSHIR.s5torikan
+00:1d71 UpdateGradeSHIR.s10torikan
+00:1d80 UpdateGradeSHIR.disqualify
+00:1d86 SFXInit
+00:1da8 SFXPopQueue
+00:1dbd SFXPushQueue
+00:1dce SFXProcessQueue
+00:1dfc SFXTriggerNoise
+00:1e22 SFXEnqueue
+00:1e37 SFXEnqueue.findsfx
+00:1f90 SFXKill
+00:1fbb SFXPlayNoise
+00:1fc6 SFXPlayNoise.noisereg
+00:1fdd SFXPlayNoise.savenoiseplayhead
+00:1fe6 SFXPlay
+00:1ff4 SFXPlay.play
+00:2000 SFXPlay.getRegister
+00:2014 SFXPlay.savePlayhead
+00:201d RNGInit
+00:2068 RNGInit.complexinit
+00:2099 ShiftHistory
+00:20b6 GetNextHellPiece
+00:20bb GetNextTGM1Piece
+00:20d8 GetNextTGM2Piece
+00:20f5 GetNextNesPiece
+00:2103 GetNextTGM3Piece
+00:21ba GetNextPiece
+00:21c8 GetNextPiece.nextpiecejumps
+00:21d7 Next35Piece
+00:21e1 Next7Piece
+00:21eb NextByte
+00:220b sTGM1GradeScores
+00:222d sTGM3InternalGradeSystem
+00:22cd sTGM3GradeBoosts
+00:22ec sTGM3LevelMultiplier
+00:22f0 sTGM3BaselineCOOL
+00:22f9 sTGM3REGRETConditions
+00:230d sDMGTGrading
+00:23c1 LevelInit
+00:2411 LevelUp
+00:2435 LevelUp.doit
+00:2479 LevelUp.checknlevel
+00:24c8 LevelUp.bellmaybe
+00:24da LevelUp.leveljinglemaybe
+00:24e7 LevelUp.checkspeedup
+00:2523 DoSpeedUp
+00:2564 ScoreInit
+00:258c IncreaseScore
+00:25c4 IncreaseScore.doConvert
+00:25dc IncreaseScore.carry
+00:25de IncreaseScore.postConvert
+00:25f2 IncreaseScore.preAddDigit
+00:261a IncreaseScore.addDigit
+00:2630 IncreaseScore.nextDigit
+00:2644 InputInit
+00:2656 GetInput
+00:2656 GetInput.btns
+00:2663 GetInput.readA
+00:2667 GetInput.setA
+00:2672 GetInput.clearA
+00:2675 GetInput.readB
+00:2679 GetInput.setB
+00:2684 GetInput.clearB
+00:2687 GetInput.readSelect
+00:268b GetInput.setSelect
+00:2696 GetInput.clearSelect
+00:2699 GetInput.readStart
+00:269d GetInput.setStart
+00:26a8 GetInput.clearStart
+00:26ab GetInput.dpad
+00:26b8 GetInput.readUp
+00:26bc GetInput.setUp
+00:26c7 GetInput.clearUp
+00:26ca GetInput.readDown
+00:26ce GetInput.setDown
+00:26d9 GetInput.clearDown
+00:26dc GetInput.readLeft
+00:26e0 GetInput.setLeft
+00:26eb GetInput.clearLeft
+00:26ee GetInput.readRight
+00:26f2 GetInput.setRight
+00:26fd GetInput.clearRight
+00:2700 GetInput.priorities
+00:270b GetInput.zero
+00:2711 RestoreSRAM
+00:276a InitializeSRAM
+00:27c8 Main
+00:27dd Main.wvr_u1
+00:27f6 Main.notgbc
+00:2825 Main.wvb_u2
+00:2830 EventLoop
+00:2846 EventLoop.eventloopjumps
+00:284f EventLoopPostHandler
+00:2851 EventLoopPostHandler.wvb_u3
+00:2863 EventLoopPostHandler.vblankjumps
+00:286c TimeInit
+00:2881 ResetGameTime
+00:288c CheckTorikan
+00:28a3 CheckTorikan.failure
+00:28a5 CheckTorikan.success
+00:28a8 HandleTimers
+00:28e0 SwitchToTitle
+00:28ea TitleEventLoopHandler
+00:28f4 TitleVBlankHandler
+00:28fe DrawOption6
+00:294e LoadTitleTiles
+00:296c LoadGameplayTiles
+00:2982 LoadGameplayTiles.gbc
+00:2991 LoadGameplayTiles.dmg
+00:29a0 UnsafeMemCopy
+00:29a9 SafeMemCopy.wvr_u1
+00:29a9 SafeMemCopy
+00:29b8 UnsafeMemSet
+00:29c0 SafeMemSet
+00:29c0 SafeMemSet.wvr_u2
+00:29ce SwitchToGameplay
+00:29d8 SwitchToGameplayBig
+00:29e2 GamePlayEventLoopHandler
+00:29ec GamePlayBigEventLoopHandler
+00:29f6 CopyOAMHandler
+00:2a02 ClearOAM
+00:2a18 IntrInit
+00:2a1c InitializeLCDCInterrupt
+00:2a31 OAMDMA
+00:2a3b OAMDMAEnd
 01:4008 sDMGTSpeedCurve
 01:4210 sDMGTSpeedCurveEnd
 01:4212 sTGM1SpeedCurve
@@ -1921,32 +1922,32 @@
 00:c82c wSPRScore4
 00:c830 wSPRScore5
 00:c834 wSPRScore6
-00:c838 wSPRCLevel1
-00:c83c wSPRCLevel2
-00:c840 wSPRCLevel3
-00:c844 wSPRCLevel4
-00:c848 wSPRNLevel1
-00:c84c wSPRNLevel2
-00:c850 wSPRNLevel3
-00:c854 wSPRNLevel4
-00:c858 wSPRQueue1A
-00:c85c wSPRQueue1B
-00:c860 wSPRQueue2A
-00:c864 wSPRQueue2B
-00:c868 wSPRModeRNG
-00:c86c wSPRModeRot
-00:c870 wSPRModeDrop
-00:c874 wSPRModeHiG
-00:c878 wGrade0
-00:c87c wGrade1
-00:c880 wUnused0
-00:c884 wUnused1
-00:c888 wUnused2
-00:c88c wUnused3
-00:c890 wUnused4
-00:c894 wUnused5
-00:c898 wUnused6
-00:c89c wUnused7
+00:c838 wSPRScore7
+00:c83c wSPRScore8
+00:c840 wSPRCLevel1
+00:c844 wSPRCLevel2
+00:c848 wSPRCLevel3
+00:c84c wSPRCLevel4
+00:c850 wSPRNLevel1
+00:c854 wSPRNLevel2
+00:c858 wSPRNLevel3
+00:c85c wSPRNLevel4
+00:c860 wSPRQueue1A
+00:c864 wSPRQueue1B
+00:c868 wSPRQueue2A
+00:c86c wSPRQueue2B
+00:c870 wSPRModeRNG
+00:c874 wSPRModeRot
+00:c878 wSPRModeDrop
+00:c87c wSPRModeHiG
+00:c880 wSPRGrade1
+00:c884 wSPRGrade2
+00:c888 wUnused0
+00:c88c wUnused1
+00:c890 wUnused2
+00:c894 wUnused3
+00:c898 wUnused4
+00:c89c wUnused5
 00:c8a0 wField
 00:c990 wBackupField
 00:ca80 wPreShadowField
@@ -2033,38 +2034,37 @@
 00:ffaf hNLevel
 00:ffb5 hPrevHundreds
 00:ffb6 hScore
-00:ffbc hScoreIncrement
-00:ffbe hScoreIncrementBCD
-00:ffc4 hScoreIncrementHead
-00:ffc5 hRNGSeed
-00:ffc9 hPieceHistory
-00:ffcd hNextPiece
-00:ffce hUpcomingPiece1
-00:ffcf hUpcomingPiece2
-00:ffd0 hCurrentPiece
-00:ffd1 hCurrentPieceX
-00:ffd2 hCurrentPieceY
-00:ffd3 hCurrentPieceRotationState
-00:ffd4 hHeldPiece
-00:ffd5 hHoldSpent
-00:ffd6 hMode
-00:ffd7 hModeCounter
-00:ffd8 hPrePause
-00:ffd9 hRequestedJingle
-00:ffda hOAMDMA
-00:ffe4 hPlayhead
-00:ffe6 hCurrentlyPlaying
-00:ffe7 hPlayQueue
-00:ffeb hNoisePlayhead
-00:ffed hUpState
-00:ffee hDownState
-00:ffef hLeftState
-00:fff0 hRightState
-00:fff1 hAState
-00:fff2 hBState
-00:fff3 hStartState
-00:fff4 hSelectState
-00:fff5 hFrameCtr
-00:fff6 hEvenFrame
-00:fff7 hGameState
-00:fff8 hLCDCCtr
+00:ffbe hScoreIncrement
+00:ffc0 hScoreIncrementBCD
+00:ffc8 hRNGSeed
+00:ffcc hPieceHistory
+00:ffd0 hNextPiece
+00:ffd1 hUpcomingPiece1
+00:ffd2 hUpcomingPiece2
+00:ffd3 hCurrentPiece
+00:ffd4 hCurrentPieceX
+00:ffd5 hCurrentPieceY
+00:ffd6 hCurrentPieceRotationState
+00:ffd7 hHeldPiece
+00:ffd8 hHoldSpent
+00:ffd9 hMode
+00:ffda hModeCounter
+00:ffdb hPrePause
+00:ffdc hRequestedJingle
+00:ffdd hOAMDMA
+00:ffe7 hPlayhead
+00:ffe9 hCurrentlyPlaying
+00:ffea hPlayQueue
+00:ffee hNoisePlayhead
+00:fff0 hUpState
+00:fff1 hDownState
+00:fff2 hLeftState
+00:fff3 hRightState
+00:fff4 hAState
+00:fff5 hBState
+00:fff6 hStartState
+00:fff7 hSelectState
+00:fff8 hFrameCtr
+00:fff9 hEvenFrame
+00:fffa hGameState
+00:fffb hLCDCCtr
diff --git a/src/field.asm b/src/field.asm
index a917933..a196545 100644
--- a/src/field.asm
+++ b/src/field.asm
@@ -4341,7 +4341,6 @@ BigFieldDelay::
     sub a, 2          ; - 2
     ldh [hComboCt], a
 
-
     ; Line clear delay.
     ; Count down the delay. If we're out of delay, clear the lines and go to LINE_ARE.
 .lineclear
diff --git a/src/grading.asm b/src/grading.asm
index 8444f03..d814228 100644
--- a/src/grading.asm
+++ b/src/grading.asm
@@ -310,15 +310,15 @@ DecayGradeDelay::
 
     ; Get the four most significant figures of the score in BC as BCD.
 PrepareScore:
-    ld a, [hScore+3]
+    ldh a, [hScore+SCORE_HUNDREDS]
     ld b, a
-    ld a, [hScore+2]
+    ldh a, [hScore+SCORE_THOUSANDS]
     swap a
     or b
     ld c, a
-    ld a, [hScore+1]
+    ldh a, [hScore+SCORE_TENTHOUSANDS]
     ld b, a
-    ld a, [hScore]
+    ldh a, [hScore+SCORE_HUNDREDTHOUSANDS]
     swap a
     or b
     ld b, a
@@ -457,10 +457,10 @@ UpdateGradeDMGT::
     ; What is our level multiplier?
     ; Running counter is in in D now.
 .levelmult
-    ld a, [hCLevel] ; thousands
+    ld a, [hCLevel+CLEVEL_THOUSANDS] ; thousands
     cp a, 1
     jr nc, .mult5
-    ld a, [hCLevel+1] ; hundreds
+    ld a, [hCLevel+CLEVEL_HUNDREDS] ; hundreds
     cp a, 7
     jr nc, .mult4
     cp a, 5
@@ -685,7 +685,7 @@ UpdateGradeTGM1:
 
 .maybegm
     ; Level needs to be 1000 or greater.
-    ld a, [hCLevel] ; Level, thousands digit.
+    ld a, [hCLevel+CLEVEL_THOUSANDS] ; Level, thousands digit.
     cp a, 1
     ret c
 
@@ -722,7 +722,7 @@ UpdateGradeDEAT:
     jr nz, .notm
 
     ; We should be GM if we're at or past level 1000.
-    ldh a, [hCLevel] ; Level, thousands digit.
+    ldh a, [hCLevel+CLEVEL_THOUSANDS] ; Level, thousands digit.
     cp a, 1
     ret c ; If less than 1000, return.
 
@@ -741,7 +741,7 @@ UpdateGradeDEAT:
 
 .notm
     ; If we're not M, check if we should be M.
-    ldh a, [hCLevel+1] ; Level, hundreds digit.
+    ldh a, [hCLevel+CLEVEL_HUNDREDS] ; Level, hundreds digit.
     cp a, 5
     ret c ; If less than 500, return.
 
@@ -786,13 +786,13 @@ UpdateGradeSHIR:
     ret z
 
     ; We don't give out a grade until level 100.
-    ldh a, [hCLevel+1] ; Level, hundreds digit.
+    ldh a, [hCLevel+CLEVEL_HUNDREDS] ; Level, hundreds digit.
     cp a, 0
     ret z
 
     ; Get the hundreds and thousands of the level as a hex number.
     ld b, a ; Hundreds
-    ldh a, [hCLevel] ; Thousands
+    ldh a, [hCLevel+CLEVEL_THOUSANDS] ; Thousands
     swap a
     or b
 
diff --git a/src/include/globals.asm b/src/include/globals.asm
index c5a8ff4..a105633 100644
--- a/src/include/globals.asm
+++ b/src/include/globals.asm
@@ -176,7 +176,7 @@ DEF HOLD_BASE_X         EQU 100
 DEF HOLD_BASE_Y         EQU 77
 DEF QUEUE_BASE_X        EQU 133
 DEF QUEUE_BASE_Y        EQU 35
-DEF SCORE_BASE_X        EQU 112
+DEF SCORE_BASE_X        EQU 99
 DEF SCORE_BASE_Y        EQU 112
 DEF LEVEL_BASE_X        EQU 112
 DEF CLEVEL_BASE_Y       EQU 133
@@ -372,5 +372,23 @@ DEF MODE_GAME_OVER          EQU 21
 DEF MODE_PRE_GAME_OVER      EQU 24
 DEF MODE_PAUSED             EQU 27
 
+; Helpers to avoid magic numbers
+DEF SCORE_ONES              EQU 7
+DEF SCORE_TENS              EQU 6
+DEF SCORE_HUNDREDS          EQU 5
+DEF SCORE_THOUSANDS         EQU 4
+DEF SCORE_TENTHOUSANDS      EQU 3
+DEF SCORE_HUNDREDTHOUSANDS  EQU 2
+DEF SCORE_MILLIONS          EQU 1
+DEF SCORE_TENMILLIONSS      EQU 0
+DEF CLEVEL_THOUSANDS        EQU 0
+DEF CLEVEL_HUNDREDS         EQU 1
+DEF CLEVEL_TENS             EQU 2
+DEF CLEVEL_ONES             EQU 3
+DEF NLEVEL_THOUSANDS        EQU 0
+DEF NLEVEL_HUNDREDS         EQU 1
+DEF NLEVEL_TENS             EQU 2
+DEF NLEVEL_ONES             EQU 3
+
 
 ENDC
diff --git a/src/score.asm b/src/score.asm
index 206b455..d47a371 100644
--- a/src/score.asm
+++ b/src/score.asm
@@ -23,10 +23,9 @@ INCLUDE "globals.asm"
 
 
 SECTION "Score Variables", HRAM
-hScore:: ds 6
-hScoreIncrement:: ds 2
-hScoreIncrementBCD:: ds 6
-hScoreIncrementHead:: ds 1
+hScore::             ds 8
+hScoreIncrement::    ds 2
+hScoreIncrementBCD:: ds 8
 
 
 SECTION "Score Functions", ROM0
@@ -39,6 +38,8 @@ ScoreInit::
     ldh [hScore+3], a
     ldh [hScore+4], a
     ldh [hScore+5], a
+    ldh [hScore+6], a
+    ldh [hScore+7], a
     ldh [hScoreIncrement], a
     ldh [hScoreIncrement+1], a
     ld a, $FF
@@ -48,6 +49,8 @@ ScoreInit::
     ldh [hScoreIncrementBCD+3], a
     ldh [hScoreIncrementBCD+4], a
     ldh [hScoreIncrementBCD+5], a
+    ldh [hScoreIncrementBCD+6], a
+    ldh [hScoreIncrementBCD+7], a
     ret
 
 
@@ -61,6 +64,8 @@ IncreaseScore::
     ldh [hScoreIncrementBCD+3], a
     ldh [hScoreIncrementBCD+4], a
     ldh [hScoreIncrementBCD+5], a
+    ldh [hScoreIncrementBCD+6], a
+    ldh [hScoreIncrementBCD+7], a
 
     ; First convert to BCD.
     ldh a, [hScoreIncrement]
@@ -112,17 +117,21 @@ IncreaseScore::
     ld [hl+], a
     ld [hl], a
 
-    ld de, hScoreIncrementBCD+5
+    ld hl, hScoreIncrementBCD+7
     ld b, 0
     ld a, $FF
-:   cp a, b
+:   cp a, [hl]
     jr nz, .preAddDigit
     inc b
-    dec de
+    dec hl
     jr :-
 
 .preAddDigit
     ; B contains the amount of times we need to shift the BCD score to the right.
+    ldh a, [hScoreIncrementBCD+6]
+    ldh [hScoreIncrementBCD+7], a
+    ldh a, [hScoreIncrementBCD+5]
+    ldh [hScoreIncrementBCD+6], a
     ldh a, [hScoreIncrementBCD+4]
     ldh [hScoreIncrementBCD+5], a
     ldh a, [hScoreIncrementBCD+3]
@@ -136,9 +145,9 @@ IncreaseScore::
     xor a, a
     ldh [hScoreIncrementBCD], a
     dec b
-    jr z, :-
-    ld hl, hScore+5
-    ld de, hScoreIncrementBCD+5
+    jr nz, .preAddDigit
+    ld hl, hScore+7
+    ld de, hScoreIncrementBCD+7
 
     ; DE is now pointing to the last digit of the BCD score.
     ; HL points at the last digit of the displayed score.
@@ -156,8 +165,8 @@ IncreaseScore::
     cp a, $0A
     jr c, .nextDigit
 
-    ; Except if this is the 6th digit.
-    ld a, 5
+    ; Except if this is the 8th digit.
+    ld a, 7
     cp a, b
     jr z, .nextDigit
 
@@ -175,7 +184,7 @@ IncreaseScore::
     dec hl
 
     ; Check if we're out of numbers.
-    ld a, 5
+    ld a, 7
     cp a, b
     jr nz, .addDigit
 
diff --git a/src/sprites.asm b/src/sprites.asm
index fa1d28e..a61e7c8 100644
--- a/src/sprites.asm
+++ b/src/sprites.asm
@@ -40,6 +40,8 @@ wSPRScore3::   ds 4
 wSPRScore4::   ds 4
 wSPRScore5::   ds 4
 wSPRScore6::   ds 4
+wSPRScore7::   ds 4
+wSPRScore8::   ds 4
 wSPRCLevel1::  ds 4
 wSPRCLevel2::  ds 4
 wSPRCLevel3::  ds 4
@@ -56,16 +58,14 @@ wSPRModeRNG::  ds 4
 wSPRModeRot::  ds 4
 wSPRModeDrop:: ds 4
 wSPRModeHiG::  ds 4
-wGrade0::      ds 4
-wGrade1::      ds 4
+wSPRGrade1::   ds 4
+wSPRGrade2::   ds 4
 wUnused0::     ds 4
 wUnused1::     ds 4
 wUnused2::     ds 4
 wUnused3::     ds 4
 wUnused4::     ds 4
 wUnused5::     ds 4
-wUnused6::     ds 4
-wUnused7::     ds 4
 ENDU
 
 
@@ -381,6 +381,64 @@ ApplyHold::
     ret
 
 
+
+
+    ; Generic function to draw a BCD number (8 digits) as 8 sprites.
+    ; Address of first sprite in hl.
+    ; Address of first digit in de.
+ApplyNumbers8::
+    inc hl
+    inc hl
+    ld bc, 4
+
+    ld a, [de]
+    add a, TILE_0
+    ld [hl], a
+    add hl, bc
+    inc de
+
+    ld a, [de]
+    add a, TILE_0
+    ld [hl], a
+    add hl, bc
+    inc de
+
+    ld a, [de]
+    add a, TILE_0
+    ld [hl], a
+    add hl, bc
+    inc de
+
+    ld a, [de]
+    add a, TILE_0
+    ld [hl], a
+    add hl, bc
+    inc de
+
+    ld a, [de]
+    add a, TILE_0
+    ld [hl], a
+    add hl, bc
+    inc de
+
+    ld a, [de]
+    add a, TILE_0
+    ld [hl], a
+    add hl, bc
+    inc de
+
+    ld a, [de]
+    add a, TILE_0
+    ld [hl], a
+    add hl, bc
+    inc de
+
+    ld a, [de]
+    add a, TILE_0
+    ld [hl], a
+    ret
+
+
     ; Generic function to draw a BCD number (6 digits) as 6 sprites.
     ; Address of first sprite in hl.
     ; Address of first digit in de.
@@ -528,6 +586,30 @@ SetNumberSpritePositions::
     ld [hl], a
     inc hl
     inc hl
+    ld b, a
+    ld a, OAMF_PAL1 | $07
+    ld [hl], a
+    ld a, b
+    add a, 8
+
+    ld hl, wSPRScore7
+    ld [hl], SCORE_BASE_Y
+    inc hl
+    ld [hl], a
+    inc hl
+    inc hl
+    ld b, a
+    ld a, OAMF_PAL1 | $07
+    ld [hl], a
+    ld a, b
+    add a, 8
+
+    ld hl, wSPRScore8
+    ld [hl], SCORE_BASE_Y
+    inc hl
+    ld [hl], a
+    inc hl
+    inc hl
     ld a, OAMF_PAL1 | $07
     ld [hl], a
 
@@ -633,22 +715,22 @@ SetNumberSpritePositions::
 GradeRendering::
     ; Set the Y position of the grade objects.
     ld a, GRADE_BASE_Y
-    ld [wGrade0], a
-    ld [wGrade1], a
+    ld [wSPRGrade1], a
+    ld [wSPRGrade2], a
 
     ; Set the X position of the grade objects.
     ldh a, [rSCX]
     ld b, a
     ld a, GRADE_BASE_X
     sub a, b
-    ld [wGrade0+1], a
+    ld [wSPRGrade1+1], a
     add a, 9
-    ld [wGrade1+1], a
+    ld [wSPRGrade2+1], a
 
     ; Set the grades to blank
     ld a, TILE_BLANK
-    ld [wGrade0+2], a
-    ld [wGrade1+2], a
+    ld [wSPRGrade1+2], a
+    ld [wSPRGrade2+2], a
 
     ; If our grade is GRADE_NONE, we don't need to do anything else.
     ld a, [wDisplayedGrade]
@@ -667,19 +749,19 @@ GradeRendering::
 
     ; Cycle the palette of the grade objects.
 .effect
-    ld a, [wGrade0+3]
+    ld a, [wSPRGrade1+3]
     inc a
     and a, OAMF_PALMASK
     or a, OAMF_PAL1
-    ld [wGrade0+3], a
-    ld [wGrade1+3], a
+    ld [wSPRGrade1+3], a
+    ld [wSPRGrade2+3], a
     jr .drawgrade
 
     ; Set the palette of the grade objects to the normal palette.
 .noeffect
     ld a, 7 | OAMF_PAL1
-    ld [wGrade0+3], a
-    ld [wGrade1+3], a
+    ld [wSPRGrade1+3], a
+    ld [wSPRGrade2+3], a
 
     ; Do we draw this as a regular grade?
 .drawgrade
@@ -692,7 +774,7 @@ GradeRendering::
     ld b, a
     ld a, "9"
     sub a, b
-    ld [wGrade1+2], a
+    ld [wSPRGrade2+2], a
     ret
 
 .sgrade
@@ -702,13 +784,13 @@ GradeRendering::
 
     ; Draw as S grade.
     ld a, "S"
-    ld [wGrade0+2], a
+    ld [wSPRGrade1+2], a
     ld a, [wDisplayedGrade]
     sub a, GRADE_S1
     ld b, a
     ld a, "1"
     add a, b
-    ld [wGrade1+2], a
+    ld [wSPRGrade2+2], a
     ret
 
 .hisgrade
@@ -718,13 +800,13 @@ GradeRendering::
 
     ; Draw as high S grade.
     ld a, "S"
-    ld [wGrade0+2], a
+    ld [wSPRGrade1+2], a
     ld a, [wDisplayedGrade]
     sub a, GRADE_S10
     ld b, a
     ld a, "a"
     add a, b
-    ld [wGrade1+2], a
+    ld [wSPRGrade2+2], a
     ret
 
 .mgrade
@@ -734,13 +816,13 @@ GradeRendering::
 
     ; Draw as m grade.
     ld a, "m"
-    ld [wGrade0+2], a
+    ld [wSPRGrade1+2], a
     ld a, [wDisplayedGrade]
     sub a, GRADE_M1
     ld b, a
     ld a, "1"
     add a, b
-    ld [wGrade1+2], a
+    ld [wSPRGrade2+2], a
     ret
 
 .lettergrade
@@ -750,7 +832,7 @@ GradeRendering::
 
     ; Draw as MX grade.
     ld a, "M"
-    ld [wGrade0+2], a
+    ld [wSPRGrade1+2], a
     ld a, [wDisplayedGrade]
     cp a, GRADE_M
     ret z ; No second letter for M.
@@ -766,30 +848,30 @@ GradeRendering::
 
 .mk
     ld a, "K"
-    ld [wGrade1+2], a
+    ld [wSPRGrade2+2], a
     ret
 
 .mv
     ld a, "V"
-    ld [wGrade1+2], a
+    ld [wSPRGrade2+2], a
     ret
 
 .mo
     ld a, "O"
-    ld [wGrade1+2], a
+    ld [wSPRGrade2+2], a
     ret
 
 .mm
     ld a, "M"
-    ld [wGrade1+2], a
+    ld [wSPRGrade2+2], a
     ret
 
 .gmgrade
     ; Draw as GM grade.
     ld a, "G"
-    ld [wGrade0+2], a
+    ld [wSPRGrade1+2], a
     ld a, "M"
-    ld [wGrade1+2], a
+    ld [wSPRGrade2+2], a
     ret
 
 
diff --git a/src/state_gameplay.asm b/src/state_gameplay.asm
index 8418c32..fee74d8 100644
--- a/src/state_gameplay.asm
+++ b/src/state_gameplay.asm
@@ -614,7 +614,7 @@ GamePlayEventLoopHandlerB::
 
     ld hl, wSPRScore1
     ld de, hScore
-    call ApplyNumbers6
+    call ApplyNumbers8
 
     ld hl, wSPRCLevel1
     ld de, hCLevel
@@ -1243,7 +1243,7 @@ GamePlayBigEventLoopHandlerB:
 
     ld hl, wSPRScore1
     ld de, hScore
-    call ApplyNumbers6
+    call ApplyNumbers8
 
     ld hl, wSPRCLevel1
     ld de, hCLevel