From 61dcceb09cf3c7ca0d4c6cfb651aeb55b0cbafec Mon Sep 17 00:00:00 2001
From: Randy Thiemann <randy.thiemann@student.pxl.be>
Date: Wed, 8 Nov 2023 21:06:40 +0100
Subject: [PATCH] Grade audio bug.

---
 bin/DMGTRIS.GBC        | Bin 131072 -> 131072 bytes
 bin/DMGTRIS.map        | 575 +++++++++++++++++++++--------------------
 bin/DMGTRIS.pocket     | Bin 131072 -> 131072 bytes
 bin/DMGTRIS.sym        | 407 +++++++++++++++--------------
 src/grading.asm        |  15 +-
 src/res/other_data.inc |  49 +++-
 src/rng.asm            |   2 +
 src/sfx.asm            |  12 +-
 8 files changed, 561 insertions(+), 499 deletions(-)

diff --git a/bin/DMGTRIS.GBC b/bin/DMGTRIS.GBC
index c197f03b39b2670c686b44fa5f255d1ccb40aaac..2d353af3712269549b0e4082fa146393ca0fffe5 100644
GIT binary patch
delta 3392
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
Lc>Gm(Xz70e@Y;a%

delta 3407
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

diff --git a/bin/DMGTRIS.map b/bin/DMGTRIS.map
index f5b0703..39313e8 100644
--- a/bin/DMGTRIS.map
+++ b/bin/DMGTRIS.map
@@ -174,7 +174,7 @@ ROM0 bank #0:
 	         $1c90 = GradeRendering.mo
 	         $1c96 = GradeRendering.mm
 	         $1c9c = GradeRendering.gmgrade
-	SECTION: $1ca7-$1fdc ($0336 bytes) ["Grading Functions"]
+	SECTION: $1ca7-$2000 ($035a bytes) ["Grading Functions"]
 	         $1ca7 = GradeInit
 	         $1cd2 = GradeInit.grade9start
 	         $1cd7 = GradeInit.end
@@ -186,290 +186,299 @@ ROM0 bank #0:
 	         $1d2d = DecayGradeDelay.gradejumptable
 	         $1d42 = PrepareScore
 	         $1d55 = DrawGradeProgressDMGT
-	         $1d64 = UpdateGradeDMGT
-	         $1d7e = UpdateGradeDMGT.clearrate
-	         $1d8f = UpdateGradeDMGT.combomult
-	         $1d9c = UpdateGradeDMGT.combo10
-	         $1dad = UpdateGradeDMGT.combo5
-	         $1dbe = UpdateGradeDMGT.combo1
-	         $1dcd = UpdateGradeDMGT.prelevel
-	         $1ddc = UpdateGradeDMGT.single
-	         $1dec = UpdateGradeDMGT.double
-	         $1dfd = UpdateGradeDMGT.adddonce
-	         $1e01 = UpdateGradeDMGT.triple
-	         $1e12 = UpdateGradeDMGT.addtonce
-	         $1e16 = UpdateGradeDMGT.tetris
-	         $1e1a = UpdateGradeDMGT.levelmult
-	         $1e32 = UpdateGradeDMGT.mult5
-	         $1e39 = UpdateGradeDMGT.mult4
-	         $1e3f = UpdateGradeDMGT.mult3
-	         $1e44 = UpdateGradeDMGT.mult2
-	         $1e48 = UpdateGradeDMGT.mult1
-	         $1e49 = UpdateGradeDMGT.processgrade
-	         $1e6f = UpdateGradeDMGT.increasegrademaybe
-	         $1e90 = UpdateGradeDMGT.gotgm
-	         $1e9b = DecayGradeDMGT
-	         $1ebf = DecayGradeDMGT.nodecay
-	         $1ec6 = DecayGradeDMGT.decay
-	         $1ed4 = UpdateGradeTGM1
-	         $1ede = UpdateGradeTGM1.trygradeup
-	         $1ef8 = UpdateGradeTGM1.increasegrade
-	         $1f0a = UpdateGradeTGM1.skipjingle
-	         $1f17 = UpdateGradeTGM1.maybegm
-	         $1f2d = UpdateGradeDEAT
-	         $1f39 = UpdateGradeDEAT.notgm
-	         $1f52 = UpdateGradeDEAT.notm
-	         $1f72 = UpdateGradeDEAT.disqualify
-	         $1f78 = UpdateGradeSHIR
-	         $1fb8 = UpdateGradeSHIR.s5torikan
-	         $1fc8 = UpdateGradeSHIR.s10torikan
-	         $1fd7 = UpdateGradeSHIR.disqualify
-	SECTION: $1fdd-$2292 ($02b6 bytes) ["Grading Data"]
-	         $1fdd = sTGM1GradeScores
-	         $1fff = sTGM3InternalGradeSystem
-	         $209f = sTGM3GradeBoosts
-	         $20be = sTGM3LevelMultiplier
-	         $20c2 = sTGM3BaselineCOOL
-	         $20cb = sTGM3REGRETConditions
-	         $20df = sDMGTGrading
-	         $2193 = sDMGTGaugeLUT
-	SECTION: $2293-$2529 ($0297 bytes) ["SFX Functions"]
-	         $2293 = SFXInit
-	         $22b5 = SFXPopQueue
-	         $22ca = SFXPushQueue
-	         $22db = SFXProcessQueue
-	         $22e8 = !0
-	         $2309 = SFXTriggerNoise
-	         $2316 = !1
-	         $2323 = !2
-	         $232f = SFXEnqueue
-	         $2344 = SFXEnqueue.findsfx
-	         $2359 = !3
-	         $2369 = !4
-	         $2379 = !5
-	         $2389 = !6
-	         $2399 = !7
-	         $23a9 = !8
-	         $23b9 = !9
-	         $23c9 = !10
-	         $23d9 = !11
-	         $23e9 = !12
-	         $23f9 = !13
-	         $2409 = !14
-	         $2419 = !15
-	         $2429 = !16
-	         $2439 = !17
-	         $2448 = !18
-	         $2457 = !19
-	         $2466 = !20
-	         $2474 = !21
-	         $2482 = !22
-	         $2490 = !23
-	         $249d = SFXKill
-	         $24c8 = SFXPlayNoise
-	         $24d3 = SFXPlayNoise.noisereg
-	         $24e0 = !24
-	         $24ea = SFXPlayNoise.savenoiseplayhead
-	         $24f3 = SFXPlay
-	         $24fe = !25
-	         $2501 = SFXPlay.play
-	         $250d = SFXPlay.getRegister
-	         $2517 = !26
-	         $2521 = SFXPlay.savePlayhead
-	SECTION: $252a-$275a ($0231 bytes) ["RNG Functions"]
-	         $252a = HarvestEntropy
-	         $2530 = HarvestEntropy.loop
-	         $2551 = RNGInit
-	         $2587 = !0
-	         $25b7 = RNGInit.complexinit
-	         $25ce = !1
-	         $25e9 = ShiftHistory
-	         $2606 = GetNextHellPiece
-	         $260b = GetNextTGM1Piece
-	         $260e = !2
-	         $2626 = !3
-	         $2628 = GetNextTGM2Piece
-	         $262b = !4
-	         $2643 = !5
-	         $2645 = GetNextNesPiece
-	         $2653 = GetNextTGM3Piece
-	         $2656 = !6
-	         $2679 = !7
-	         $267c = !8
-	         $268c = !9
-	         $2696 = !10
-	         $26a4 = !11
-	         $26b3 = !12
-	         $26bf = !13
-	         $26cb = !14
-	         $26d7 = !15
-	         $26e3 = !16
-	         $26ef = !17
-	         $26fb = !18
-	         $270a = GetNextPiece
-	         $2718 = GetNextPiece.nextpiecejumps
-	         $2727 = Next35Piece
-	         $2727 = !19
-	         $2731 = Next7Piece
-	         $2731 = !20
-	         $273b = NextByte
-	SECTION: $275b-$28fd ($01a3 bytes) ["Level Functions"]
-	         $275b = LevelInit
-	         $27ab = LevelUp
-	         $27cf = LevelUp.doit
-	         $2813 = LevelUp.checknlevel
-	         $2841 = !0
-	         $2859 = !1
-	         $2862 = LevelUp.bellmaybe
-	         $2874 = LevelUp.leveljinglemaybe
-	         $2881 = LevelUp.checkspeedup
-	         $2892 = !2
-	         $289f = !3
-	         $28b0 = !4
-	         $28bd = DoSpeedUp
-	SECTION: $28fe-$2a47 ($014a bytes) ["Progress Data"]
-	         $28fe = sProgressData
-	SECTION: $2a48-$2b27 ($00e0 bytes) ["Score Functions"]
-	         $2a48 = ScoreInit
-	         $2a70 = IncreaseScore
-	         $2aa8 = IncreaseScore.doConvert
-	         $2aaa = !0
-	         $2ac0 = IncreaseScore.carry
-	         $2ac2 = IncreaseScore.postConvert
-	         $2acf = !1
-	         $2ad6 = IncreaseScore.preAddDigit
-	         $2afe = IncreaseScore.addDigit
-	         $2b14 = IncreaseScore.nextDigit
-	SECTION: $2b28-$2bf4 ($00cd bytes) ["Input Functions"]
-	         $2b28 = InputInit
-	         $2b3a = GetInput
-	         $2b3a = GetInput.btns
-	         $2b47 = GetInput.readA
-	         $2b4b = GetInput.setA
-	         $2b56 = GetInput.clearA
-	         $2b59 = GetInput.readB
-	         $2b5d = GetInput.setB
-	         $2b68 = GetInput.clearB
-	         $2b6b = GetInput.readSelect
-	         $2b6f = GetInput.setSelect
-	         $2b7a = GetInput.clearSelect
-	         $2b7d = GetInput.readStart
-	         $2b81 = GetInput.setStart
-	         $2b8c = GetInput.clearStart
-	         $2b8f = GetInput.dpad
-	         $2b9c = GetInput.readUp
-	         $2ba0 = GetInput.setUp
-	         $2bab = GetInput.clearUp
-	         $2bae = GetInput.readDown
-	         $2bb2 = GetInput.setDown
-	         $2bbd = GetInput.clearDown
-	         $2bc0 = GetInput.readLeft
-	         $2bc4 = GetInput.setLeft
-	         $2bcf = GetInput.clearLeft
-	         $2bd2 = GetInput.readRight
-	         $2bd6 = GetInput.setRight
-	         $2be1 = GetInput.clearRight
-	         $2be4 = GetInput.priorities
-	         $2bef = GetInput.zero
-	SECTION: $2bf5-$2cab ($00b7 bytes) ["SRAM Functions"]
-	         $2bf5 = RestoreSRAM
-	         $2c4e = InitializeSRAM
-	SECTION: $2cac-$2d5d ($00b2 bytes) ["Progress Functions"]
-	         $2cac = SetProgress
-	         $2cb7 = SetProgress.loop
-	         $2cbb = SetProgress.correct
-	         $2ce2 = SetProgress.wvr_u1
-	         $2cee = SetProgress.wvr_u2
-	         $2cfc = SetProgress.wvr_u3
-	         $2d08 = SetProgress.wvr_u4
-	         $2d16 = SetProgress.wvr_u5
-	         $2d22 = SetProgress.wvr_u6
-	         $2d30 = SetProgress.wvr_u7
-	         $2d3c = SetProgress.wvr_u8
-	         $2d4a = SetProgress.wvr_u9
-	         $2d56 = SetProgress.wvr_u10
-	SECTION: $2d5e-$2df5 ($0098 bytes) ["Code Entry Point"]
-	         $2d5e = Main
-	         $2d87 = Main.notgbc
-	         $2d8d = Main.wvr_u1
-	         $2dba = EventLoop
-	         $2dd0 = EventLoop.eventloopjumps
-	         $2dd9 = EventLoopPostHandler
-	         $2ddb = EventLoopPostHandler.wvb_u2
-	         $2ded = EventLoopPostHandler.vblankjumps
-	SECTION: $2df6-$2e7d ($0088 bytes) ["Time Functions"]
-	         $2df6 = TimeInit
-	         $2e0b = ResetGameTime
-	         $2e16 = CheckTorikan
-	         $2e2d = CheckTorikan.failure
-	         $2e2f = CheckTorikan.success
-	         $2e32 = HandleTimers
-	         $2e5a = HandleTimers.go
-	SECTION: $2e7e-$2eea ($006d bytes) ["Title Function Trampolines"]
-	         $2e7e = SwitchToTitle
-	         $2e87 = TitleEventLoopHandler
-	         $2e91 = TitleVBlankHandler
-	         $2e9b = DrawOption6
-	SECTION: $2eeb-$2f3c ($0052 bytes) ["Tile Functions"]
-	         $2eeb = LoadTitleTiles
-	         $2f09 = LoadGameplayTiles
-	         $2f1f = LoadGameplayTiles.gbc
-	         $2f2e = LoadGameplayTiles.dmg
-	SECTION: $2f3d-$2f78 ($003c bytes) ["Time Data"]
-	         $2f3d = sFramesToCS
-	SECTION: $2f79-$2fa6 ($002e bytes) ["Memory Functions"]
-	         $2f79 = UnsafeMemCopy
-	         $2f82 = SafeMemCopy.wvr_u1
-	         $2f82 = SafeMemCopy
-	         $2f91 = UnsafeMemSet
-	         $2f99 = SafeMemSet
-	         $2f99 = SafeMemSet.wvr_u2
-	SECTION: $2fa7-$2fcc ($0026 bytes) ["Gameplay Function Trampolines"]
-	         $2fa7 = SwitchToGameplay
-	         $2fb0 = SwitchToGameplayBig
-	         $2fb9 = GamePlayEventLoopHandler
-	         $2fc3 = GamePlayBigEventLoopHandler
-	SECTION: $2fcd-$2fee ($0022 bytes) ["OAM Functions"]
-	         $2fcd = CopyOAMHandler
-	         $2fd9 = ClearOAM
-	SECTION: $2fef-$3007 ($0019 bytes) ["Interrupt Initialization Functions"]
-	         $2fef = IntrInit
-	         $2ff3 = InitializeLCDCInterrupt
-	SECTION: $3008-$3016 ($000f bytes) ["Banking Functions"]
-	         $3008 = BankingInit
-	SECTION: $3017-$3020 ($000a bytes) ["OAM DMA Code"]
-	         $3017 = OAMDMA
-	         $3021 = OAMDMAEnd
-	EMPTY: $3021-$3fff ($0fdf bytes)
-	TOTAL EMPTY: $0fea bytes
+	         $1d61 = !0
+	         $1d70 = UpdateGradeDMGT
+	         $1d8a = UpdateGradeDMGT.clearrate
+	         $1d9b = UpdateGradeDMGT.combomult
+	         $1da8 = UpdateGradeDMGT.combo10
+	         $1db9 = UpdateGradeDMGT.combo5
+	         $1dca = UpdateGradeDMGT.combo1
+	         $1dd9 = UpdateGradeDMGT.prelevel
+	         $1de8 = UpdateGradeDMGT.single
+	         $1df8 = UpdateGradeDMGT.double
+	         $1e09 = UpdateGradeDMGT.adddonce
+	         $1e0d = UpdateGradeDMGT.triple
+	         $1e1e = UpdateGradeDMGT.addtonce
+	         $1e22 = UpdateGradeDMGT.tetris
+	         $1e26 = UpdateGradeDMGT.levelmult
+	         $1e3e = UpdateGradeDMGT.mult5
+	         $1e45 = UpdateGradeDMGT.mult4
+	         $1e4b = UpdateGradeDMGT.mult3
+	         $1e50 = UpdateGradeDMGT.mult2
+	         $1e54 = UpdateGradeDMGT.mult1
+	         $1e55 = UpdateGradeDMGT.processgrade
+	         $1e7e = UpdateGradeDMGT.increasegrademaybe
+	         $1ea2 = UpdateGradeDMGT.gotgm
+	         $1eb0 = DecayGradeDMGT
+	         $1ed4 = DecayGradeDMGT.nodecay
+	         $1edb = DecayGradeDMGT.decay
+	         $1ee9 = UpdateGradeTGM1
+	         $1ef3 = UpdateGradeTGM1.trygradeup
+	         $1f0d = UpdateGradeTGM1.increasegrade
+	         $1f22 = UpdateGradeTGM1.skipjingle
+	         $1f2f = UpdateGradeTGM1.maybegm
+	         $1f48 = UpdateGradeDEAT
+	         $1f54 = UpdateGradeDEAT.notgm
+	         $1f70 = UpdateGradeDEAT.notm
+	         $1f93 = UpdateGradeDEAT.disqualify
+	         $1f99 = UpdateGradeSHIR
+	         $1fdc = UpdateGradeSHIR.s5torikan
+	         $1fec = UpdateGradeSHIR.s10torikan
+	         $1ffb = UpdateGradeSHIR.disqualify
+	SECTION: $2001-$22b6 ($02b6 bytes) ["Grading Data"]
+	         $2001 = sTGM1GradeScores
+	         $2023 = sTGM3InternalGradeSystem
+	         $20c3 = sTGM3GradeBoosts
+	         $20e2 = sTGM3LevelMultiplier
+	         $20e6 = sTGM3BaselineCOOL
+	         $20ef = sTGM3REGRETConditions
+	         $2103 = sDMGTGrading
+	         $21b7 = sDMGTGaugeLUT
+	SECTION: $22b7-$2550 ($029a bytes) ["SFX Functions"]
+	         $22b7 = SFXInit
+	         $22d9 = SFXPopQueue
+	         $22ee = SFXPushQueue
+	         $22ff = SFXProcessQueue
+	         $2310 = !0
+	         $232b = !1
+	         $232d = SFXTriggerNoise
+	         $233a = !2
+	         $2347 = !3
+	         $2353 = SFXEnqueue
+	         $2368 = SFXEnqueue.findsfx
+	         $237d = !4
+	         $238d = !5
+	         $239d = !6
+	         $23ad = !7
+	         $23bd = !8
+	         $23cd = !9
+	         $23dd = !10
+	         $23ed = !11
+	         $23fd = !12
+	         $240d = !13
+	         $241d = !14
+	         $242d = !15
+	         $243d = !16
+	         $244d = !17
+	         $245d = !18
+	         $246c = !19
+	         $247b = !20
+	         $248a = !21
+	         $2499 = !22
+	         $24a7 = !23
+	         $24b5 = !24
+	         $24c2 = SFXKill
+	         $24ef = SFXPlayNoise
+	         $24fa = SFXPlayNoise.noisereg
+	         $2507 = !25
+	         $2511 = SFXPlayNoise.savenoiseplayhead
+	         $251a = SFXPlay
+	         $2525 = !26
+	         $2528 = SFXPlay.play
+	         $2534 = SFXPlay.getRegister
+	         $253e = !27
+	         $2548 = SFXPlay.savePlayhead
+	SECTION: $2551-$2783 ($0233 bytes) ["RNG Functions"]
+	         $2551 = HarvestEntropy
+	         $2557 = HarvestEntropy.loop
+	         $2578 = RNGInit
+	         $25ae = !0
+	         $25de = RNGInit.complexinit
+	         $25f5 = !1
+	         $2610 = ShiftHistory
+	         $262d = GetNextHellPiece
+	         $2632 = GetNextTGM1Piece
+	         $2635 = !2
+	         $264d = !3
+	         $264f = GetNextTGM2Piece
+	         $2652 = !4
+	         $266a = !5
+	         $266c = GetNextNesPiece
+	         $267a = GetNextTGM3Piece
+	         $267d = !6
+	         $26a0 = !7
+	         $26a3 = !8
+	         $26b3 = !9
+	         $26bd = !10
+	         $26cb = !11
+	         $26da = !12
+	         $26e6 = !13
+	         $26f2 = !14
+	         $26fe = !15
+	         $270a = !16
+	         $2716 = !17
+	         $2722 = !18
+	         $2731 = GetNextPiece
+	         $273f = GetNextPiece.nextpiecejumps
+	         $274e = Next35Piece
+	         $274e = !19
+	         $2758 = Next7Piece
+	         $275a = !20
+	         $2764 = NextByte
+	SECTION: $2784-$2926 ($01a3 bytes) ["Level Functions"]
+	         $2784 = LevelInit
+	         $27d4 = LevelUp
+	         $27f8 = LevelUp.doit
+	         $283c = LevelUp.checknlevel
+	         $286a = !0
+	         $2882 = !1
+	         $288b = LevelUp.bellmaybe
+	         $289d = LevelUp.leveljinglemaybe
+	         $28aa = LevelUp.checkspeedup
+	         $28bb = !2
+	         $28c8 = !3
+	         $28d9 = !4
+	         $28e6 = DoSpeedUp
+	SECTION: $2927-$2a70 ($014a bytes) ["Progress Data"]
+	         $2927 = sProgressData
+	SECTION: $2a71-$2b50 ($00e0 bytes) ["Score Functions"]
+	         $2a71 = ScoreInit
+	         $2a99 = IncreaseScore
+	         $2ad1 = IncreaseScore.doConvert
+	         $2ad3 = !0
+	         $2ae9 = IncreaseScore.carry
+	         $2aeb = IncreaseScore.postConvert
+	         $2af8 = !1
+	         $2aff = IncreaseScore.preAddDigit
+	         $2b27 = IncreaseScore.addDigit
+	         $2b3d = IncreaseScore.nextDigit
+	SECTION: $2b51-$2c1d ($00cd bytes) ["Input Functions"]
+	         $2b51 = InputInit
+	         $2b63 = GetInput
+	         $2b63 = GetInput.btns
+	         $2b70 = GetInput.readA
+	         $2b74 = GetInput.setA
+	         $2b7f = GetInput.clearA
+	         $2b82 = GetInput.readB
+	         $2b86 = GetInput.setB
+	         $2b91 = GetInput.clearB
+	         $2b94 = GetInput.readSelect
+	         $2b98 = GetInput.setSelect
+	         $2ba3 = GetInput.clearSelect
+	         $2ba6 = GetInput.readStart
+	         $2baa = GetInput.setStart
+	         $2bb5 = GetInput.clearStart
+	         $2bb8 = GetInput.dpad
+	         $2bc5 = GetInput.readUp
+	         $2bc9 = GetInput.setUp
+	         $2bd4 = GetInput.clearUp
+	         $2bd7 = GetInput.readDown
+	         $2bdb = GetInput.setDown
+	         $2be6 = GetInput.clearDown
+	         $2be9 = GetInput.readLeft
+	         $2bed = GetInput.setLeft
+	         $2bf8 = GetInput.clearLeft
+	         $2bfb = GetInput.readRight
+	         $2bff = GetInput.setRight
+	         $2c0a = GetInput.clearRight
+	         $2c0d = GetInput.priorities
+	         $2c18 = GetInput.zero
+	SECTION: $2c1e-$2cd4 ($00b7 bytes) ["SRAM Functions"]
+	         $2c1e = RestoreSRAM
+	         $2c77 = InitializeSRAM
+	SECTION: $2cd5-$2d86 ($00b2 bytes) ["Progress Functions"]
+	         $2cd5 = SetProgress
+	         $2ce0 = SetProgress.loop
+	         $2ce4 = SetProgress.correct
+	         $2d0b = SetProgress.wvr_u1
+	         $2d17 = SetProgress.wvr_u2
+	         $2d25 = SetProgress.wvr_u3
+	         $2d31 = SetProgress.wvr_u4
+	         $2d3f = SetProgress.wvr_u5
+	         $2d4b = SetProgress.wvr_u6
+	         $2d59 = SetProgress.wvr_u7
+	         $2d65 = SetProgress.wvr_u8
+	         $2d73 = SetProgress.wvr_u9
+	         $2d7f = SetProgress.wvr_u10
+	SECTION: $2d87-$2e1e ($0098 bytes) ["Code Entry Point"]
+	         $2d87 = Main
+	         $2db0 = Main.notgbc
+	         $2db6 = Main.wvr_u1
+	         $2de3 = EventLoop
+	         $2df9 = EventLoop.eventloopjumps
+	         $2e02 = EventLoopPostHandler
+	         $2e04 = EventLoopPostHandler.wvb_u2
+	         $2e16 = EventLoopPostHandler.vblankjumps
+	SECTION: $2e1f-$2ea6 ($0088 bytes) ["Time Functions"]
+	         $2e1f = TimeInit
+	         $2e34 = ResetGameTime
+	         $2e3f = CheckTorikan
+	         $2e56 = CheckTorikan.failure
+	         $2e58 = CheckTorikan.success
+	         $2e5b = HandleTimers
+	         $2e83 = HandleTimers.go
+	SECTION: $2ea7-$2f13 ($006d bytes) ["Title Function Trampolines"]
+	         $2ea7 = SwitchToTitle
+	         $2eb0 = TitleEventLoopHandler
+	         $2eba = TitleVBlankHandler
+	         $2ec4 = DrawOption6
+	SECTION: $2f14-$2f65 ($0052 bytes) ["Tile Functions"]
+	         $2f14 = LoadTitleTiles
+	         $2f32 = LoadGameplayTiles
+	         $2f48 = LoadGameplayTiles.gbc
+	         $2f57 = LoadGameplayTiles.dmg
+	SECTION: $2f66-$2fa1 ($003c bytes) ["Time Data"]
+	         $2f66 = sFramesToCS
+	SECTION: $2fa2-$2fcf ($002e bytes) ["Memory Functions"]
+	         $2fa2 = UnsafeMemCopy
+	         $2fab = SafeMemCopy.wvr_u1
+	         $2fab = SafeMemCopy
+	         $2fba = UnsafeMemSet
+	         $2fc2 = SafeMemSet
+	         $2fc2 = SafeMemSet.wvr_u2
+	SECTION: $2fd0-$2ff5 ($0026 bytes) ["Gameplay Function Trampolines"]
+	         $2fd0 = SwitchToGameplay
+	         $2fd9 = SwitchToGameplayBig
+	         $2fe2 = GamePlayEventLoopHandler
+	         $2fec = GamePlayBigEventLoopHandler
+	SECTION: $2ff6-$3017 ($0022 bytes) ["OAM Functions"]
+	         $2ff6 = CopyOAMHandler
+	         $3002 = ClearOAM
+	SECTION: $3018-$3030 ($0019 bytes) ["Interrupt Initialization Functions"]
+	         $3018 = IntrInit
+	         $301c = InitializeLCDCInterrupt
+	SECTION: $3031-$303f ($000f bytes) ["Banking Functions"]
+	         $3031 = BankingInit
+	SECTION: $3040-$3049 ($000a bytes) ["OAM DMA Code"]
+	         $3040 = OAMDMA
+	         $304a = OAMDMAEnd
+	EMPTY: $304a-$3fff ($0fb6 bytes)
+	TOTAL EMPTY: $0fc1 bytes
 
 ROMX bank #1:
 	SECTION: $4000-$4007 ($0008 bytes) ["Bank ID BANK_OTHER"]
-	SECTION: $4008-$7283 ($327c bytes) ["Static Global data"]
+	SECTION: $4008-$7293 ($328c bytes) ["Static Global data"]
 	         $4008 = sDMGTSpeedCurve
-	         $4210 = sDMGTSpeedCurveEnd
-	         $4212 = sTGM1SpeedCurve
-	         $4398 = sTGM1SpeedCurveEnd
-	         $439a = sCHILSpeedCurve
-	         $44b8 = sCHILSpeedCurveEnd
-	         $44ba = sTGM3SpeedCurve
-	         $469b = sTGM3SpeedCurveEnd
-	         $469d = sDEATSpeedCurve
-	         $46eb = sDEATSpeedCurveEnd
-	         $46ed = sSHIRSpeedCurve
-	         $4748 = sSHIRSpeedCurveEnd
-	         $474a = sMYCOSpeedCurve
-	         $4882 = sMYCOSpeedCurveEnd
-	         $4884 = sSharedTiles
-	         $4b84 = sTitleTiles
-	         $4b84 = sSharedTilesEnd
-	         $5884 = sTitleTilesEnd
-	         $5884 = sGameplayTilesM
-	         $6584 = sGameplayTilesMEnd
-	         $6584 = sGameplayTilesC
-	         $7284 = sGameplayTilesCEnd
-	EMPTY: $7284-$7fff ($0d7c bytes)
-	TOTAL EMPTY: $0d7c bytes
+	         $4203 = sDMGTSpeedCurveEnd
+	         $4205 = sDMGTSpeedCurveSpecialData
+	         $420b = sTGM1SpeedCurve
+	         $4391 = sTGM1SpeedCurveEnd
+	         $4393 = sTGM1SpeedCurveSpecialData
+	         $4399 = sCHILSpeedCurve
+	         $44b7 = sCHILSpeedCurveEnd
+	         $44b9 = sCHILSpeedCurveSpecialData
+	         $44bf = sTGM3SpeedCurve
+	         $46a0 = sTGM3SpeedCurveEnd
+	         $46a2 = sTGM3SpeedCurveSpecialData
+	         $46a8 = sDEATSpeedCurve
+	         $46f6 = sDEATSpeedCurveEnd
+	         $46f8 = sDEATSpeedCurveSpecialData
+	         $46fe = sSHIRSpeedCurve
+	         $4759 = sSHIRSpeedCurveEnd
+	         $475b = sSHIRSpeedCurveSpecialData
+	         $4761 = sMYCOSpeedCurve
+	         $488c = sMYCOSpeedCurveEnd
+	         $488e = sMYCOSpeedCurveSpecialData
+	         $4894 = sSharedTiles
+	         $4b94 = sTitleTiles
+	         $4b94 = sSharedTilesEnd
+	         $5894 = sTitleTilesEnd
+	         $5894 = sGameplayTilesM
+	         $6594 = sGameplayTilesMEnd
+	         $6594 = sGameplayTilesC
+	         $7294 = sGameplayTilesCEnd
+	EMPTY: $7294-$7fff ($0d6c bytes)
+	TOTAL EMPTY: $0d6c bytes
 
 ROMX bank #2:
 	SECTION: $4000-$4007 ($0008 bytes) ["Bank ID BANK_SFX"]
@@ -2470,8 +2479,8 @@ HRAM bank #0:
 	TOTAL EMPTY: $0003 bytes
 
 SUMMARY:
-	ROM0: 12310 bytes used / 4074 free
-	ROMX: 56883 bytes used / 41421 free in 6 banks
+	ROM0: 12351 bytes used / 4033 free
+	ROMX: 56899 bytes used / 41405 free in 6 banks
 	SRAM: 14 bytes used / 8178 free in 1 bank
 	WRAM0: 3515 bytes used / 581 free
 	HRAM: 124 bytes used / 3 free
diff --git a/bin/DMGTRIS.pocket b/bin/DMGTRIS.pocket
index e12300ee4233a41541e43d4b0fac406f494559d9..7687ad059fff149454ae5aefc3bde50ef2e8d55e 100644
GIT binary patch
delta 3392
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
L$dT7!_JaQa1sZ{I

delta 3407
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

diff --git a/bin/DMGTRIS.sym b/bin/DMGTRIS.sym
index 4ef78c2..36c8df9 100644
--- a/bin/DMGTRIS.sym
+++ b/bin/DMGTRIS.sym
@@ -150,207 +150,214 @@
 00:1d2d DecayGradeDelay.gradejumptable
 00:1d42 PrepareScore
 00:1d55 DrawGradeProgressDMGT
-00:1d64 UpdateGradeDMGT
-00:1d7e UpdateGradeDMGT.clearrate
-00:1d8f UpdateGradeDMGT.combomult
-00:1d9c UpdateGradeDMGT.combo10
-00:1dad UpdateGradeDMGT.combo5
-00:1dbe UpdateGradeDMGT.combo1
-00:1dcd UpdateGradeDMGT.prelevel
-00:1ddc UpdateGradeDMGT.single
-00:1dec UpdateGradeDMGT.double
-00:1dfd UpdateGradeDMGT.adddonce
-00:1e01 UpdateGradeDMGT.triple
-00:1e12 UpdateGradeDMGT.addtonce
-00:1e16 UpdateGradeDMGT.tetris
-00:1e1a UpdateGradeDMGT.levelmult
-00:1e32 UpdateGradeDMGT.mult5
-00:1e39 UpdateGradeDMGT.mult4
-00:1e3f UpdateGradeDMGT.mult3
-00:1e44 UpdateGradeDMGT.mult2
-00:1e48 UpdateGradeDMGT.mult1
-00:1e49 UpdateGradeDMGT.processgrade
-00:1e6f UpdateGradeDMGT.increasegrademaybe
-00:1e90 UpdateGradeDMGT.gotgm
-00:1e9b DecayGradeDMGT
-00:1ebf DecayGradeDMGT.nodecay
-00:1ec6 DecayGradeDMGT.decay
-00:1ed4 UpdateGradeTGM1
-00:1ede UpdateGradeTGM1.trygradeup
-00:1ef8 UpdateGradeTGM1.increasegrade
-00:1f0a UpdateGradeTGM1.skipjingle
-00:1f17 UpdateGradeTGM1.maybegm
-00:1f2d UpdateGradeDEAT
-00:1f39 UpdateGradeDEAT.notgm
-00:1f52 UpdateGradeDEAT.notm
-00:1f72 UpdateGradeDEAT.disqualify
-00:1f78 UpdateGradeSHIR
-00:1fb8 UpdateGradeSHIR.s5torikan
-00:1fc8 UpdateGradeSHIR.s10torikan
-00:1fd7 UpdateGradeSHIR.disqualify
-00:1fdd sTGM1GradeScores
-00:1fff sTGM3InternalGradeSystem
-00:209f sTGM3GradeBoosts
-00:20be sTGM3LevelMultiplier
-00:20c2 sTGM3BaselineCOOL
-00:20cb sTGM3REGRETConditions
-00:20df sDMGTGrading
-00:2193 sDMGTGaugeLUT
-00:2293 SFXInit
-00:22b5 SFXPopQueue
-00:22ca SFXPushQueue
-00:22db SFXProcessQueue
-00:2309 SFXTriggerNoise
-00:232f SFXEnqueue
-00:2344 SFXEnqueue.findsfx
-00:249d SFXKill
-00:24c8 SFXPlayNoise
-00:24d3 SFXPlayNoise.noisereg
-00:24ea SFXPlayNoise.savenoiseplayhead
-00:24f3 SFXPlay
-00:2501 SFXPlay.play
-00:250d SFXPlay.getRegister
-00:2521 SFXPlay.savePlayhead
-00:252a HarvestEntropy
-00:2530 HarvestEntropy.loop
-00:2551 RNGInit
-00:25b7 RNGInit.complexinit
-00:25e9 ShiftHistory
-00:2606 GetNextHellPiece
-00:260b GetNextTGM1Piece
-00:2628 GetNextTGM2Piece
-00:2645 GetNextNesPiece
-00:2653 GetNextTGM3Piece
-00:270a GetNextPiece
-00:2718 GetNextPiece.nextpiecejumps
-00:2727 Next35Piece
-00:2731 Next7Piece
-00:273b NextByte
-00:275b LevelInit
-00:27ab LevelUp
-00:27cf LevelUp.doit
-00:2813 LevelUp.checknlevel
-00:2862 LevelUp.bellmaybe
-00:2874 LevelUp.leveljinglemaybe
-00:2881 LevelUp.checkspeedup
-00:28bd DoSpeedUp
-00:28fe sProgressData
-00:2a48 ScoreInit
-00:2a70 IncreaseScore
-00:2aa8 IncreaseScore.doConvert
-00:2ac0 IncreaseScore.carry
-00:2ac2 IncreaseScore.postConvert
-00:2ad6 IncreaseScore.preAddDigit
-00:2afe IncreaseScore.addDigit
-00:2b14 IncreaseScore.nextDigit
-00:2b28 InputInit
-00:2b3a GetInput
-00:2b3a GetInput.btns
-00:2b47 GetInput.readA
-00:2b4b GetInput.setA
-00:2b56 GetInput.clearA
-00:2b59 GetInput.readB
-00:2b5d GetInput.setB
-00:2b68 GetInput.clearB
-00:2b6b GetInput.readSelect
-00:2b6f GetInput.setSelect
-00:2b7a GetInput.clearSelect
-00:2b7d GetInput.readStart
-00:2b81 GetInput.setStart
-00:2b8c GetInput.clearStart
-00:2b8f GetInput.dpad
-00:2b9c GetInput.readUp
-00:2ba0 GetInput.setUp
-00:2bab GetInput.clearUp
-00:2bae GetInput.readDown
-00:2bb2 GetInput.setDown
-00:2bbd GetInput.clearDown
-00:2bc0 GetInput.readLeft
-00:2bc4 GetInput.setLeft
-00:2bcf GetInput.clearLeft
-00:2bd2 GetInput.readRight
-00:2bd6 GetInput.setRight
-00:2be1 GetInput.clearRight
-00:2be4 GetInput.priorities
-00:2bef GetInput.zero
-00:2bf5 RestoreSRAM
-00:2c4e InitializeSRAM
-00:2cac SetProgress
-00:2cb7 SetProgress.loop
-00:2cbb SetProgress.correct
-00:2ce2 SetProgress.wvr_u1
-00:2cee SetProgress.wvr_u2
-00:2cfc SetProgress.wvr_u3
-00:2d08 SetProgress.wvr_u4
-00:2d16 SetProgress.wvr_u5
-00:2d22 SetProgress.wvr_u6
-00:2d30 SetProgress.wvr_u7
-00:2d3c SetProgress.wvr_u8
-00:2d4a SetProgress.wvr_u9
-00:2d56 SetProgress.wvr_u10
-00:2d5e Main
-00:2d87 Main.notgbc
-00:2d8d Main.wvr_u1
-00:2dba EventLoop
-00:2dd0 EventLoop.eventloopjumps
-00:2dd9 EventLoopPostHandler
-00:2ddb EventLoopPostHandler.wvb_u2
-00:2ded EventLoopPostHandler.vblankjumps
-00:2df6 TimeInit
-00:2e0b ResetGameTime
-00:2e16 CheckTorikan
-00:2e2d CheckTorikan.failure
-00:2e2f CheckTorikan.success
-00:2e32 HandleTimers
-00:2e5a HandleTimers.go
-00:2e7e SwitchToTitle
-00:2e87 TitleEventLoopHandler
-00:2e91 TitleVBlankHandler
-00:2e9b DrawOption6
-00:2eeb LoadTitleTiles
-00:2f09 LoadGameplayTiles
-00:2f1f LoadGameplayTiles.gbc
-00:2f2e LoadGameplayTiles.dmg
-00:2f3d sFramesToCS
-00:2f79 UnsafeMemCopy
-00:2f82 SafeMemCopy.wvr_u1
-00:2f82 SafeMemCopy
-00:2f91 UnsafeMemSet
-00:2f99 SafeMemSet
-00:2f99 SafeMemSet.wvr_u2
-00:2fa7 SwitchToGameplay
-00:2fb0 SwitchToGameplayBig
-00:2fb9 GamePlayEventLoopHandler
-00:2fc3 GamePlayBigEventLoopHandler
-00:2fcd CopyOAMHandler
-00:2fd9 ClearOAM
-00:2fef IntrInit
-00:2ff3 InitializeLCDCInterrupt
-00:3008 BankingInit
-00:3017 OAMDMA
-00:3021 OAMDMAEnd
+00:1d70 UpdateGradeDMGT
+00:1d8a UpdateGradeDMGT.clearrate
+00:1d9b UpdateGradeDMGT.combomult
+00:1da8 UpdateGradeDMGT.combo10
+00:1db9 UpdateGradeDMGT.combo5
+00:1dca UpdateGradeDMGT.combo1
+00:1dd9 UpdateGradeDMGT.prelevel
+00:1de8 UpdateGradeDMGT.single
+00:1df8 UpdateGradeDMGT.double
+00:1e09 UpdateGradeDMGT.adddonce
+00:1e0d UpdateGradeDMGT.triple
+00:1e1e UpdateGradeDMGT.addtonce
+00:1e22 UpdateGradeDMGT.tetris
+00:1e26 UpdateGradeDMGT.levelmult
+00:1e3e UpdateGradeDMGT.mult5
+00:1e45 UpdateGradeDMGT.mult4
+00:1e4b UpdateGradeDMGT.mult3
+00:1e50 UpdateGradeDMGT.mult2
+00:1e54 UpdateGradeDMGT.mult1
+00:1e55 UpdateGradeDMGT.processgrade
+00:1e7e UpdateGradeDMGT.increasegrademaybe
+00:1ea2 UpdateGradeDMGT.gotgm
+00:1eb0 DecayGradeDMGT
+00:1ed4 DecayGradeDMGT.nodecay
+00:1edb DecayGradeDMGT.decay
+00:1ee9 UpdateGradeTGM1
+00:1ef3 UpdateGradeTGM1.trygradeup
+00:1f0d UpdateGradeTGM1.increasegrade
+00:1f22 UpdateGradeTGM1.skipjingle
+00:1f2f UpdateGradeTGM1.maybegm
+00:1f48 UpdateGradeDEAT
+00:1f54 UpdateGradeDEAT.notgm
+00:1f70 UpdateGradeDEAT.notm
+00:1f93 UpdateGradeDEAT.disqualify
+00:1f99 UpdateGradeSHIR
+00:1fdc UpdateGradeSHIR.s5torikan
+00:1fec UpdateGradeSHIR.s10torikan
+00:1ffb UpdateGradeSHIR.disqualify
+00:2001 sTGM1GradeScores
+00:2023 sTGM3InternalGradeSystem
+00:20c3 sTGM3GradeBoosts
+00:20e2 sTGM3LevelMultiplier
+00:20e6 sTGM3BaselineCOOL
+00:20ef sTGM3REGRETConditions
+00:2103 sDMGTGrading
+00:21b7 sDMGTGaugeLUT
+00:22b7 SFXInit
+00:22d9 SFXPopQueue
+00:22ee SFXPushQueue
+00:22ff SFXProcessQueue
+00:232d SFXTriggerNoise
+00:2353 SFXEnqueue
+00:2368 SFXEnqueue.findsfx
+00:24c2 SFXKill
+00:24ef SFXPlayNoise
+00:24fa SFXPlayNoise.noisereg
+00:2511 SFXPlayNoise.savenoiseplayhead
+00:251a SFXPlay
+00:2528 SFXPlay.play
+00:2534 SFXPlay.getRegister
+00:2548 SFXPlay.savePlayhead
+00:2551 HarvestEntropy
+00:2557 HarvestEntropy.loop
+00:2578 RNGInit
+00:25de RNGInit.complexinit
+00:2610 ShiftHistory
+00:262d GetNextHellPiece
+00:2632 GetNextTGM1Piece
+00:264f GetNextTGM2Piece
+00:266c GetNextNesPiece
+00:267a GetNextTGM3Piece
+00:2731 GetNextPiece
+00:273f GetNextPiece.nextpiecejumps
+00:274e Next35Piece
+00:2758 Next7Piece
+00:2764 NextByte
+00:2784 LevelInit
+00:27d4 LevelUp
+00:27f8 LevelUp.doit
+00:283c LevelUp.checknlevel
+00:288b LevelUp.bellmaybe
+00:289d LevelUp.leveljinglemaybe
+00:28aa LevelUp.checkspeedup
+00:28e6 DoSpeedUp
+00:2927 sProgressData
+00:2a71 ScoreInit
+00:2a99 IncreaseScore
+00:2ad1 IncreaseScore.doConvert
+00:2ae9 IncreaseScore.carry
+00:2aeb IncreaseScore.postConvert
+00:2aff IncreaseScore.preAddDigit
+00:2b27 IncreaseScore.addDigit
+00:2b3d IncreaseScore.nextDigit
+00:2b51 InputInit
+00:2b63 GetInput
+00:2b63 GetInput.btns
+00:2b70 GetInput.readA
+00:2b74 GetInput.setA
+00:2b7f GetInput.clearA
+00:2b82 GetInput.readB
+00:2b86 GetInput.setB
+00:2b91 GetInput.clearB
+00:2b94 GetInput.readSelect
+00:2b98 GetInput.setSelect
+00:2ba3 GetInput.clearSelect
+00:2ba6 GetInput.readStart
+00:2baa GetInput.setStart
+00:2bb5 GetInput.clearStart
+00:2bb8 GetInput.dpad
+00:2bc5 GetInput.readUp
+00:2bc9 GetInput.setUp
+00:2bd4 GetInput.clearUp
+00:2bd7 GetInput.readDown
+00:2bdb GetInput.setDown
+00:2be6 GetInput.clearDown
+00:2be9 GetInput.readLeft
+00:2bed GetInput.setLeft
+00:2bf8 GetInput.clearLeft
+00:2bfb GetInput.readRight
+00:2bff GetInput.setRight
+00:2c0a GetInput.clearRight
+00:2c0d GetInput.priorities
+00:2c18 GetInput.zero
+00:2c1e RestoreSRAM
+00:2c77 InitializeSRAM
+00:2cd5 SetProgress
+00:2ce0 SetProgress.loop
+00:2ce4 SetProgress.correct
+00:2d0b SetProgress.wvr_u1
+00:2d17 SetProgress.wvr_u2
+00:2d25 SetProgress.wvr_u3
+00:2d31 SetProgress.wvr_u4
+00:2d3f SetProgress.wvr_u5
+00:2d4b SetProgress.wvr_u6
+00:2d59 SetProgress.wvr_u7
+00:2d65 SetProgress.wvr_u8
+00:2d73 SetProgress.wvr_u9
+00:2d7f SetProgress.wvr_u10
+00:2d87 Main
+00:2db0 Main.notgbc
+00:2db6 Main.wvr_u1
+00:2de3 EventLoop
+00:2df9 EventLoop.eventloopjumps
+00:2e02 EventLoopPostHandler
+00:2e04 EventLoopPostHandler.wvb_u2
+00:2e16 EventLoopPostHandler.vblankjumps
+00:2e1f TimeInit
+00:2e34 ResetGameTime
+00:2e3f CheckTorikan
+00:2e56 CheckTorikan.failure
+00:2e58 CheckTorikan.success
+00:2e5b HandleTimers
+00:2e83 HandleTimers.go
+00:2ea7 SwitchToTitle
+00:2eb0 TitleEventLoopHandler
+00:2eba TitleVBlankHandler
+00:2ec4 DrawOption6
+00:2f14 LoadTitleTiles
+00:2f32 LoadGameplayTiles
+00:2f48 LoadGameplayTiles.gbc
+00:2f57 LoadGameplayTiles.dmg
+00:2f66 sFramesToCS
+00:2fa2 UnsafeMemCopy
+00:2fab SafeMemCopy.wvr_u1
+00:2fab SafeMemCopy
+00:2fba UnsafeMemSet
+00:2fc2 SafeMemSet
+00:2fc2 SafeMemSet.wvr_u2
+00:2fd0 SwitchToGameplay
+00:2fd9 SwitchToGameplayBig
+00:2fe2 GamePlayEventLoopHandler
+00:2fec GamePlayBigEventLoopHandler
+00:2ff6 CopyOAMHandler
+00:3002 ClearOAM
+00:3018 IntrInit
+00:301c InitializeLCDCInterrupt
+00:3031 BankingInit
+00:3040 OAMDMA
+00:304a OAMDMAEnd
 01:4008 sDMGTSpeedCurve
-01:4210 sDMGTSpeedCurveEnd
-01:4212 sTGM1SpeedCurve
-01:4398 sTGM1SpeedCurveEnd
-01:439a sCHILSpeedCurve
-01:44b8 sCHILSpeedCurveEnd
-01:44ba sTGM3SpeedCurve
-01:469b sTGM3SpeedCurveEnd
-01:469d sDEATSpeedCurve
-01:46eb sDEATSpeedCurveEnd
-01:46ed sSHIRSpeedCurve
-01:4748 sSHIRSpeedCurveEnd
-01:474a sMYCOSpeedCurve
-01:4882 sMYCOSpeedCurveEnd
-01:4884 sSharedTiles
-01:4b84 sTitleTiles
-01:4b84 sSharedTilesEnd
-01:5884 sTitleTilesEnd
-01:5884 sGameplayTilesM
-01:6584 sGameplayTilesMEnd
-01:6584 sGameplayTilesC
-01:7284 sGameplayTilesCEnd
+01:4203 sDMGTSpeedCurveEnd
+01:4205 sDMGTSpeedCurveSpecialData
+01:420b sTGM1SpeedCurve
+01:4391 sTGM1SpeedCurveEnd
+01:4393 sTGM1SpeedCurveSpecialData
+01:4399 sCHILSpeedCurve
+01:44b7 sCHILSpeedCurveEnd
+01:44b9 sCHILSpeedCurveSpecialData
+01:44bf sTGM3SpeedCurve
+01:46a0 sTGM3SpeedCurveEnd
+01:46a2 sTGM3SpeedCurveSpecialData
+01:46a8 sDEATSpeedCurve
+01:46f6 sDEATSpeedCurveEnd
+01:46f8 sDEATSpeedCurveSpecialData
+01:46fe sSHIRSpeedCurve
+01:4759 sSHIRSpeedCurveEnd
+01:475b sSHIRSpeedCurveSpecialData
+01:4761 sMYCOSpeedCurve
+01:488c sMYCOSpeedCurveEnd
+01:488e sMYCOSpeedCurveSpecialData
+01:4894 sSharedTiles
+01:4b94 sTitleTiles
+01:4b94 sSharedTilesEnd
+01:5894 sTitleTilesEnd
+01:5894 sGameplayTilesM
+01:6594 sGameplayTilesMEnd
+01:6594 sGameplayTilesC
+01:7294 sGameplayTilesCEnd
 02:4008 sSFXPieceI
 02:4325 sSFXPieceZ
 02:4325 sSFXPieceIEnd
diff --git a/src/grading.asm b/src/grading.asm
index d2b1f60..9965e3d 100644
--- a/src/grading.asm
+++ b/src/grading.asm
@@ -346,7 +346,12 @@ PrepareScore:
     ret
 
 DrawGradeProgressDMGT::
-    ld hl, sDMGTGaugeLUT
+    ld a, [wDisplayedGrade]
+    cp a, GRADE_GM
+    jr nz, :+
+    ld a, $FF
+    ld [wGradeGauge], a
+:   ld hl, sDMGTGaugeLUT
     ld a, [wGradeGauge]
     ld b, 0
     ld c, a
@@ -552,6 +557,7 @@ UpdateGradeDMGT::
     jr z, .gotgm
 
     ; No, play the normal jingle.
+    call SFXKill
     ld a, SFX_RANKUP
     call SFXEnqueue
     ld a, $0F
@@ -578,6 +584,7 @@ UpdateGradeDMGT::
     jr z, .gotgm
 
     ; No, play the normal jingle.
+    call SFXKill
     ld a, SFX_RANKUP
     call SFXEnqueue
     ld a, $0F
@@ -585,6 +592,7 @@ UpdateGradeDMGT::
     ret
 
 .gotgm
+    call SFXKill
     ld a, SFX_RANKGM
     call SFXEnqueue
     ld a, $0F
@@ -700,6 +708,7 @@ UpdateGradeTGM1:
     ldh a, [hCurrentlyPlaying]
     cp a, SFX_RANKUP
     jr z, .skipjingle
+    call SFXKill
     ld a, SFX_RANKUP
     call SFXEnqueue
 
@@ -725,6 +734,7 @@ UpdateGradeTGM1:
     ld [wDisplayedGrade], a
 
     ; Sound effect
+    call SFXKill
     ld a, SFX_RANKGM
     jp SFXEnqueue
 
@@ -762,6 +772,7 @@ UpdateGradeDEAT:
     ld [wDisplayedGrade], a
 
     ; Play the jingle.
+    call SFXKill
     ld a, SFX_RANKGM
     call SFXEnqueue
 
@@ -790,6 +801,7 @@ UpdateGradeDEAT:
     ld [wDisplayedGrade], a
 
     ; Play the jingle.
+    call SFXKill
     ld a, SFX_RANKUP
     call SFXEnqueue
 
@@ -850,6 +862,7 @@ UpdateGradeSHIR:
     ld [wDisplayedGrade], a ; Otherwise, set the grade.
 
     ; Play the jingle.
+    call SFXKill
     ld a, SFX_RANKUP
     call SFXEnqueue
 
diff --git a/src/res/other_data.inc b/src/res/other_data.inc
index 550b996..c77dfb3 100644
--- a/src/res/other_data.inc
+++ b/src/res/other_data.inc
@@ -186,15 +186,17 @@ sDMGTSpeedCurve::       ; Speed curve of the game.
 
     dw $6666, 6666, $6700 ; Level 6666
     db 20, $00
-    db 1, 1, 1, 2, 1
-
-    dw $9999, 9999, $9999 ; Level 9999
-    db 20, $00
-    db 1, 1, 1, 1, 1
+    db 1, 1, 1, 3, 1
 
 sDMGTSpeedCurveEnd::
     dw $FFFF              ; End.
 
+sDMGTSpeedCurveSpecialData::
+    dw $FFFF    ; When do we get bones?
+    dw $2000    ; When do blocks turn invisible?
+    dw $9999    ; When is the hard kill screen?
+
+
 sTGM1SpeedCurve::
     dw $0000, 0, $0100
     db 1, 4
@@ -319,6 +321,11 @@ sTGM1SpeedCurve::
 sTGM1SpeedCurveEnd::
     dw $FFFF
 
+sTGM1SpeedCurveSpecialData::
+    dw $FFFF    ; When do we get bones?
+    dw $FFFF    ; When do blocks turn invisible?
+    dw $0999    ; When is the hard kill screen?
+
 
 sCHILSpeedCurve::
     dw $0000, 0, $0100
@@ -412,6 +419,11 @@ sCHILSpeedCurve::
 sCHILSpeedCurveEnd::
     dw $FFFF
 
+sCHILSpeedCurveSpecialData::
+    dw $FFFF    ; When do we get bones?
+    dw $FFFF    ; When do blocks turn invisible?
+    dw $9999    ; When is the hard kill screen?
+
 
 sTGM3SpeedCurve::
     dw $0000, 0, $0100
@@ -565,6 +577,11 @@ sTGM3SpeedCurve::
 sTGM3SpeedCurveEnd::
     dw $FFFF
 
+sTGM3SpeedCurveSpecialData::
+    dw $FFFF    ; When do we get bones?
+    dw $1300    ; When do blocks turn invisible?
+    dw $1500    ; When is the hard kill screen?
+
 sDEATSpeedCurve::
     dw $0000, 0, $0100
     db 20, $00
@@ -593,6 +610,12 @@ sDEATSpeedCurve::
 sDEATSpeedCurveEnd::
     dw $FFFF
 
+sDEATSpeedCurveSpecialData::
+    dw $FFFF    ; When do we get bones?
+    dw $0999    ; When do blocks turn invisible?
+    dw $1200    ; When is the hard kill screen?
+
+
 sSHIRSpeedCurve::
     dw $0000, 0, $0100
     db 20, $00
@@ -625,6 +648,12 @@ sSHIRSpeedCurve::
 sSHIRSpeedCurveEnd::
     dw $FFFF
 
+sSHIRSpeedCurveSpecialData::
+    dw $0900    ; When do we get bones?
+    dw $1300    ; When do blocks turn invisible?
+    dw $1500    ; When is the hard kill screen?
+
+
 sMYCOSpeedCurve::
     dw $0000, 0, $0100
     db 1, 4
@@ -718,13 +747,15 @@ sMYCOSpeedCurve::
     db 20, $00
     db 20, 20, 8, 30, 20
 
-    dw $0300, 300, $0400
-    db 20, $00
-    db 1, 1, 1, 1, 1
-
 sMYCOSpeedCurveEnd::
     dw $FFFF
 
+sMYCOSpeedCurveSpecialData::
+    dw $FFFF    ; When do we get bones?
+    dw $FFFF    ; When do blocks turn invisible?
+    dw $0300    ; When is the hard kill screen?
+
+
 sSharedTiles::
     DB $FF,$FF,$FF,$FF,$FF,$FF,$FF,$FF
     DB $FF,$FF,$FF,$FF,$FF,$FF,$FF,$FF
diff --git a/src/rng.asm b/src/rng.asm
index f44fc1d..ba902db 100644
--- a/src/rng.asm
+++ b/src/rng.asm
@@ -432,6 +432,8 @@ Next35Piece:
 
     ; Tries generating bytes until it gets one in [0; 7)
 Next7Piece:
+    xor a, a
+    ret
 :   call NextByte
     and a, $07
     cp a, 7
diff --git a/src/sfx.asm b/src/sfx.asm
index f9073f5..68d31a1 100644
--- a/src/sfx.asm
+++ b/src/sfx.asm
@@ -92,6 +92,8 @@ SFXProcessQueue:
     xor a, a
     ldh [hPlayhead], a
     ldh [hPlayhead+1], a
+    ld a, $FF
+    ldh [hCurrentlyPlaying], a
 
     ; Music will just repeat.
     ldh a, [hPlayQueue]
@@ -100,10 +102,7 @@ SFXProcessQueue:
     jr SFXEnqueue
 
     ; Try 4 times to pop a sound effect off the queue.
-:   ld a, $FF
-    ldh [hCurrentlyPlaying], a
-
-    call SFXPopQueue
+:   call SFXPopQueue
     cp a, $FF
     jr nz, :+
     call SFXPopQueue
@@ -117,7 +116,7 @@ SFXProcessQueue:
     ret z
 
     ; If we got a valid sound effect, then play it.
-    jr SFXEnqueue
+:   jr SFXEnqueue
 
 
     ; Noise effects use their own playhead that can play at the same time as the normal queue.
@@ -341,7 +340,7 @@ SFXEnqueue::
     ldh [hPlayhead], a
     ld a, HIGH(sSFXLevelUp)
     ldh [hPlayhead+1], a
-    jr SFXPlay
+    jp SFXPlay
 
     ; Other
 :   cp a, SFX_RANKUP
@@ -395,6 +394,7 @@ SFXKill::
     ldh [hPlayQueue+1], a
     ldh [hPlayQueue+2], a
     ldh [hPlayQueue+3], a
+    ldh [hCurrentlyPlaying], a
     xor a, a
     ldh [hPlayhead], a
     ldh [hPlayhead+1], a