This commit is contained in:
Randy Thiemann 2023-11-01 21:24:22 +01:00
parent 6719abe893
commit c2c7845396
13 changed files with 673 additions and 312 deletions

Binary file not shown.

View File

@ -141,7 +141,7 @@ ROM0 bank #0:
$1887 = GradeRendering.regulargrade $1887 = GradeRendering.regulargrade
$188f = GradeRendering.sgrade $188f = GradeRendering.sgrade
$18a5 = GradeRendering.gmgrade $18a5 = GradeRendering.gmgrade
SECTION: $18b0-$1b31 ($0282 bytes) ["SFX Functions"] SECTION: $18b0-$1b46 ($0297 bytes) ["SFX Functions"]
$18b0 = SFXInit $18b0 = SFXInit
$18d2 = SFXPopQueue $18d2 = SFXPopQueue
$18e7 = SFXPushQueue $18e7 = SFXPushQueue
@ -151,186 +151,187 @@ ROM0 bank #0:
$1933 = !1 $1933 = !1
$1940 = !2 $1940 = !2
$194c = SFXEnqueue $194c = SFXEnqueue
$195e = SFXEnqueue.findsfx $1961 = SFXEnqueue.findsfx
$1973 = !3 $1976 = !3
$1983 = !4 $1986 = !4
$1993 = !5 $1996 = !5
$19a3 = !6 $19a6 = !6
$19b3 = !7 $19b6 = !7
$19c3 = !8 $19c6 = !8
$19d3 = !9 $19d6 = !9
$19e3 = !10 $19e6 = !10
$19f3 = !11 $19f6 = !11
$1a03 = !12 $1a06 = !12
$1a13 = !13 $1a16 = !13
$1a23 = !14 $1a26 = !14
$1a33 = !15 $1a36 = !15
$1a43 = !16 $1a46 = !16
$1a53 = !17 $1a56 = !17
$1a62 = !18 $1a65 = !18
$1a71 = !19 $1a74 = !19
$1a7f = !20 $1a83 = !20
$1a8d = !21 $1a91 = !21
$1a9b = !22 $1a9f = !22
$1aa8 = SFXKill $1aad = !23
$1ad0 = SFXPlayNoise $1aba = SFXKill
$1adb = SFXPlayNoise.noisereg $1ae5 = SFXPlayNoise
$1ae8 = !23 $1af0 = SFXPlayNoise.noisereg
$1af2 = SFXPlayNoise.savenoiseplayhead $1afd = !24
$1afb = SFXPlay $1b07 = SFXPlayNoise.savenoiseplayhead
$1b06 = !24 $1b10 = SFXPlay
$1b09 = SFXPlay.play $1b1b = !25
$1b15 = SFXPlay.getRegister $1b1e = SFXPlay.play
$1b1f = !25 $1b2a = SFXPlay.getRegister
$1b29 = SFXPlay.savePlayhead $1b34 = !26
SECTION: $1b32-$1d1f ($01ee bytes) ["RNG Functions"] $1b3e = SFXPlay.savePlayhead
$1b32 = RNGInit SECTION: $1b47-$1d34 ($01ee bytes) ["RNG Functions"]
$1b62 = !0 $1b47 = RNGInit
$1b7d = RNGInit.complexinit $1b77 = !0
$1b94 = !1 $1b92 = RNGInit.complexinit
$1bae = ShiftHistory $1ba9 = !1
$1bcb = GetNextHellPiece $1bc3 = ShiftHistory
$1bd0 = GetNextTGM1Piece $1be0 = GetNextHellPiece
$1bd3 = !2 $1be5 = GetNextTGM1Piece
$1beb = !3 $1be8 = !2
$1bed = GetNextTGM2Piece $1c00 = !3
$1bf0 = !4 $1c02 = GetNextTGM2Piece
$1c08 = !5 $1c05 = !4
$1c0a = GetNextNesPiece $1c1d = !5
$1c18 = GetNextTGM3Piece $1c1f = GetNextNesPiece
$1c1b = !6 $1c2d = GetNextTGM3Piece
$1c3e = !7 $1c30 = !6
$1c41 = !8 $1c53 = !7
$1c51 = !9 $1c56 = !8
$1c5b = !10 $1c66 = !9
$1c69 = !11 $1c70 = !10
$1c78 = !12 $1c7e = !11
$1c84 = !13 $1c8d = !12
$1c90 = !14 $1c99 = !13
$1c9c = !15 $1ca5 = !14
$1ca8 = !16 $1cb1 = !15
$1cb4 = !17 $1cbd = !16
$1cc0 = !18 $1cc9 = !17
$1ccf = GetNextPiece $1cd5 = !18
$1cdd = GetNextPiece.nextpiecejumps $1ce4 = GetNextPiece
$1cec = Next35Piece $1cf2 = GetNextPiece.nextpiecejumps
$1cec = !19 $1d01 = Next35Piece
$1cf6 = Next7Piece $1d01 = !19
$1cf6 = !20 $1d0b = Next7Piece
$1d00 = NextByte $1d0b = !20
SECTION: $1d20-$1ec2 ($01a3 bytes) ["Level Functions"] $1d15 = NextByte
$1d20 = LevelInit SECTION: $1d35-$1ed7 ($01a3 bytes) ["Level Functions"]
$1d70 = LevelUp $1d35 = LevelInit
$1d94 = LevelUp.doit $1d85 = LevelUp
$1dd8 = LevelUp.checknlevel $1da9 = LevelUp.doit
$1e06 = !0 $1ded = LevelUp.checknlevel
$1e1e = !1 $1e1b = !0
$1e27 = LevelUp.bellmaybe $1e33 = !1
$1e39 = LevelUp.leveljinglemaybe $1e3c = LevelUp.bellmaybe
$1e46 = LevelUp.checkspeedup $1e4e = LevelUp.leveljinglemaybe
$1e57 = !2 $1e5b = LevelUp.checkspeedup
$1e64 = !3 $1e6c = !2
$1e75 = !4 $1e79 = !3
$1e82 = DoSpeedUp $1e8a = !4
SECTION: $1ec3-$1f8f ($00cd bytes) ["Input Functions"] $1e97 = DoSpeedUp
$1ec3 = InputInit SECTION: $1ed8-$1fa4 ($00cd bytes) ["Input Functions"]
$1ed5 = GetInput $1ed8 = InputInit
$1ed5 = GetInput.btns $1eea = GetInput
$1ee2 = GetInput.readA $1eea = GetInput.btns
$1ee6 = GetInput.setA $1ef7 = GetInput.readA
$1ef1 = GetInput.clearA $1efb = GetInput.setA
$1ef4 = GetInput.readB $1f06 = GetInput.clearA
$1ef8 = GetInput.setB $1f09 = GetInput.readB
$1f03 = GetInput.clearB $1f0d = GetInput.setB
$1f06 = GetInput.readSelect $1f18 = GetInput.clearB
$1f0a = GetInput.setSelect $1f1b = GetInput.readSelect
$1f15 = GetInput.clearSelect $1f1f = GetInput.setSelect
$1f18 = GetInput.readStart $1f2a = GetInput.clearSelect
$1f1c = GetInput.setStart $1f2d = GetInput.readStart
$1f27 = GetInput.clearStart $1f31 = GetInput.setStart
$1f2a = GetInput.dpad $1f3c = GetInput.clearStart
$1f37 = GetInput.readUp $1f3f = GetInput.dpad
$1f3b = GetInput.setUp $1f4c = GetInput.readUp
$1f46 = GetInput.clearUp $1f50 = GetInput.setUp
$1f49 = GetInput.readDown $1f5b = GetInput.clearUp
$1f4d = GetInput.setDown $1f5e = GetInput.readDown
$1f58 = GetInput.clearDown $1f62 = GetInput.setDown
$1f5b = GetInput.readLeft $1f6d = GetInput.clearDown
$1f5f = GetInput.setLeft $1f70 = GetInput.readLeft
$1f6a = GetInput.clearLeft $1f74 = GetInput.setLeft
$1f6d = GetInput.readRight $1f7f = GetInput.clearLeft
$1f71 = GetInput.setRight $1f82 = GetInput.readRight
$1f7c = GetInput.clearRight $1f86 = GetInput.setRight
$1f7f = GetInput.priorities $1f91 = GetInput.clearRight
$1f8a = GetInput.zero $1f94 = GetInput.priorities
SECTION: $1f90-$205b ($00cc bytes) ["Score Functions"] $1f9f = GetInput.zero
$1f90 = ScoreInit SECTION: $1fa5-$2070 ($00cc bytes) ["Score Functions"]
$1fb0 = IncreaseScore $1fa5 = ScoreInit
$1fe4 = IncreaseScore.doConvert $1fc5 = IncreaseScore
$1fe6 = !0 $1ff9 = IncreaseScore.doConvert
$1ffc = IncreaseScore.carry $1ffb = !0
$1ffe = IncreaseScore.postConvert $2011 = IncreaseScore.carry
$200b = !1 $2013 = IncreaseScore.postConvert
$2012 = IncreaseScore.preAddDigit $2020 = !1
$2032 = IncreaseScore.addDigit $2027 = IncreaseScore.preAddDigit
$2048 = IncreaseScore.nextDigit $2047 = IncreaseScore.addDigit
SECTION: $205c-$211e ($00c3 bytes) ["Code Entry Point"] $205d = IncreaseScore.nextDigit
$205c = Main SECTION: $2071-$2133 ($00c3 bytes) ["Code Entry Point"]
$2071 = Main.wvr_u1 $2071 = Main
$207a = !0 $2086 = Main.wvr_u1
$208a = Main.notgbc $208f = !0
$20b7 = Main.nocolortiles $209f = Main.notgbc
$20d8 = Main.wvb_u2 $20cc = Main.nocolortiles
$20dd = !1 $20ed = Main.wvb_u2
$20e3 = EventLoop $20f2 = !1
$20f9 = EventLoop.eventloopjumps $20f8 = EventLoop
$2102 = EventLoopPostHandler $210e = EventLoop.eventloopjumps
$2104 = EventLoopPostHandler.wvb_u3 $2117 = EventLoopPostHandler
$2116 = EventLoopPostHandler.vblankjumps $2119 = EventLoopPostHandler.wvb_u3
SECTION: $211f-$21d5 ($00b7 bytes) ["SRAM Functions"] $212b = EventLoopPostHandler.vblankjumps
$211f = RestoreSRAM SECTION: $2134-$21ea ($00b7 bytes) ["SRAM Functions"]
$2178 = InitializeSRAM $2134 = RestoreSRAM
SECTION: $21d6-$2247 ($0072 bytes) ["Grading Functions"] $218d = InitializeSRAM
$21d6 = GradeInit SECTION: $21eb-$225c ($0072 bytes) ["Grading Functions"]
$21e4 = UpdateGrade $21eb = GradeInit
$21ed = UpdateGrade.trygradeup $21f9 = UpdateGrade
$2207 = UpdateGrade.increasegrade $2202 = UpdateGrade.trygradeup
$221b = CheckForGM $221c = UpdateGrade.increasegrade
$2231 = PrepareScore $2230 = CheckForGM
SECTION: $2248-$22b5 ($006e bytes) ["Title Function Trampolines"] $2246 = PrepareScore
$2248 = SwitchToTitle SECTION: $225d-$22ca ($006e bytes) ["Title Function Trampolines"]
$2252 = TitleEventLoopHandler $225d = SwitchToTitle
$225c = TitleVBlankHandler $2267 = TitleEventLoopHandler
$2266 = DrawOption6 $2271 = TitleVBlankHandler
SECTION: $22b6-$2302 ($004d bytes) ["Time Functions"] $227b = DrawOption6
$22b6 = TimeInit SECTION: $22cb-$2317 ($004d bytes) ["Time Functions"]
$22cb = ResetTime $22cb = TimeInit
$22d6 = HandleTimers $22e0 = ResetTime
SECTION: $2303-$2330 ($002e bytes) ["Memory Functions"] $22eb = HandleTimers
$2303 = UnsafeMemCopy SECTION: $2318-$2345 ($002e bytes) ["Memory Functions"]
$230c = SafeMemCopy.wvr_u1 $2318 = UnsafeMemCopy
$230c = SafeMemCopy $2321 = SafeMemCopy.wvr_u1
$231b = UnsafeMemSet $2321 = SafeMemCopy
$2323 = SafeMemSet $2330 = UnsafeMemSet
$2323 = SafeMemSet.wvr_u2 $2338 = SafeMemSet
SECTION: $2331-$2358 ($0028 bytes) ["Gameplay Function Trampolines"] $2338 = SafeMemSet.wvr_u2
$2331 = SwitchToGameplay SECTION: $2346-$236d ($0028 bytes) ["Gameplay Function Trampolines"]
$233b = SwitchToGameplayBig $2346 = SwitchToGameplay
$2345 = GamePlayEventLoopHandler $2350 = SwitchToGameplayBig
$234f = GamePlayBigEventLoopHandler $235a = GamePlayEventLoopHandler
SECTION: $2359-$237a ($0022 bytes) ["Grading Data"] $2364 = GamePlayBigEventLoopHandler
$2359 = sGradeScores SECTION: $236e-$238f ($0022 bytes) ["Grading Data"]
SECTION: $237b-$239c ($0022 bytes) ["OAM Functions"] $236e = sGradeScores
$237b = CopyOAMHandler SECTION: $2390-$23b1 ($0022 bytes) ["OAM Functions"]
$2387 = ClearOAM $2390 = CopyOAMHandler
SECTION: $239d-$23b5 ($0019 bytes) ["Interrupt Initialization Functions"] $239c = ClearOAM
$239d = IntrInit SECTION: $23b2-$23ca ($0019 bytes) ["Interrupt Initialization Functions"]
$23a1 = InitializeLCDCInterrupt $23b2 = IntrInit
SECTION: $23b6-$23bf ($000a bytes) ["OAM DMA Code"] $23b6 = InitializeLCDCInterrupt
$23b6 = OAMDMA SECTION: $23cb-$23d4 ($000a bytes) ["OAM DMA Code"]
$23c0 = OAMDMAEnd $23cb = OAMDMA
EMPTY: $23c0-$3fff ($1c40 bytes) $23d5 = OAMDMAEnd
TOTAL EMPTY: $1c4b bytes EMPTY: $23d5-$3fff ($1c2b bytes)
TOTAL EMPTY: $1c36 bytes
ROMX bank #1: ROMX bank #1:
SECTION: $4000-$4007 ($0008 bytes) ["Bank ID BANK_OTHER"] SECTION: $4000-$4007 ($0008 bytes) ["Bank ID BANK_OTHER"]
@ -356,7 +357,7 @@ ROMX bank #1:
ROMX bank #2: ROMX bank #2:
SECTION: $4000-$4007 ($0008 bytes) ["Bank ID BANK_SFX"] SECTION: $4000-$4007 ($0008 bytes) ["Bank ID BANK_SFX"]
SECTION: $4008-$67d1 ($27ca bytes) ["SFX Data"] SECTION: $4008-$6c16 ($2c0f bytes) ["SFX Data"]
$4008 = sSFXPieceI $4008 = sSFXPieceI
$4325 = sSFXPieceZ $4325 = sSFXPieceZ
$4325 = sSFXPieceIEnd $4325 = sSFXPieceIEnd
@ -396,15 +397,17 @@ ROMX bank #2:
$5e72 = sSFXLevelUpEnd $5e72 = sSFXLevelUpEnd
$5fcd = sSFXReadyGo $5fcd = sSFXReadyGo
$5fcd = sSFXRankUpEnd $5fcd = sSFXRankUpEnd
$673b = sSFXLineClear $673b = sSFXRankGM
$673b = sSFXReadyGoEnd $673b = sSFXReadyGoEnd
$6751 = sSFXLand $6b80 = sSFXLineClear
$6751 = sSFXLineClearEnd $6b80 = sSFXRankGMEnd
$675c = sSFXLock $6b96 = sSFXLand
$675c = sSFXLandEnd $6b96 = sSFXLineClearEnd
$67d2 = sSFXLockEnd $6ba1 = sSFXLock
EMPTY: $67d2-$7fff ($182e bytes) $6ba1 = sSFXLandEnd
TOTAL EMPTY: $182e bytes $6c17 = sSFXLockEnd
EMPTY: $6c17-$7fff ($13e9 bytes)
TOTAL EMPTY: $13e9 bytes
ROMX bank #3: ROMX bank #3:
SECTION: $4000-$4007 ($0008 bytes) ["Bank ID BANK_MUSIC"] SECTION: $4000-$4007 ($0008 bytes) ["Bank ID BANK_MUSIC"]
@ -2304,8 +2307,8 @@ HRAM bank #0:
TOTAL EMPTY: $0006 bytes TOTAL EMPTY: $0006 bytes
SUMMARY: SUMMARY:
ROM0: 9141 bytes used / 7243 free ROM0: 9162 bytes used / 7222 free
ROMX: 48836 bytes used / 49468 free in 6 banks ROMX: 49929 bytes used / 48375 free in 6 banks
SRAM: 14 bytes used / 8178 free in 1 bank SRAM: 14 bytes used / 8178 free in 1 bank
WRAM0: 3489 bytes used / 607 free WRAM0: 3489 bytes used / 607 free
HRAM: 121 bytes used / 6 free HRAM: 121 bytes used / 6 free

Binary file not shown.

View File

@ -112,116 +112,116 @@
00:18f8 SFXProcessQueue 00:18f8 SFXProcessQueue
00:1926 SFXTriggerNoise 00:1926 SFXTriggerNoise
00:194c SFXEnqueue 00:194c SFXEnqueue
00:195e SFXEnqueue.findsfx 00:1961 SFXEnqueue.findsfx
00:1aa8 SFXKill 00:1aba SFXKill
00:1ad0 SFXPlayNoise 00:1ae5 SFXPlayNoise
00:1adb SFXPlayNoise.noisereg 00:1af0 SFXPlayNoise.noisereg
00:1af2 SFXPlayNoise.savenoiseplayhead 00:1b07 SFXPlayNoise.savenoiseplayhead
00:1afb SFXPlay 00:1b10 SFXPlay
00:1b09 SFXPlay.play 00:1b1e SFXPlay.play
00:1b15 SFXPlay.getRegister 00:1b2a SFXPlay.getRegister
00:1b29 SFXPlay.savePlayhead 00:1b3e SFXPlay.savePlayhead
00:1b32 RNGInit 00:1b47 RNGInit
00:1b7d RNGInit.complexinit 00:1b92 RNGInit.complexinit
00:1bae ShiftHistory 00:1bc3 ShiftHistory
00:1bcb GetNextHellPiece 00:1be0 GetNextHellPiece
00:1bd0 GetNextTGM1Piece 00:1be5 GetNextTGM1Piece
00:1bed GetNextTGM2Piece 00:1c02 GetNextTGM2Piece
00:1c0a GetNextNesPiece 00:1c1f GetNextNesPiece
00:1c18 GetNextTGM3Piece 00:1c2d GetNextTGM3Piece
00:1ccf GetNextPiece 00:1ce4 GetNextPiece
00:1cdd GetNextPiece.nextpiecejumps 00:1cf2 GetNextPiece.nextpiecejumps
00:1cec Next35Piece 00:1d01 Next35Piece
00:1cf6 Next7Piece 00:1d0b Next7Piece
00:1d00 NextByte 00:1d15 NextByte
00:1d20 LevelInit 00:1d35 LevelInit
00:1d70 LevelUp 00:1d85 LevelUp
00:1d94 LevelUp.doit 00:1da9 LevelUp.doit
00:1dd8 LevelUp.checknlevel 00:1ded LevelUp.checknlevel
00:1e27 LevelUp.bellmaybe 00:1e3c LevelUp.bellmaybe
00:1e39 LevelUp.leveljinglemaybe 00:1e4e LevelUp.leveljinglemaybe
00:1e46 LevelUp.checkspeedup 00:1e5b LevelUp.checkspeedup
00:1e82 DoSpeedUp 00:1e97 DoSpeedUp
00:1ec3 InputInit 00:1ed8 InputInit
00:1ed5 GetInput 00:1eea GetInput
00:1ed5 GetInput.btns 00:1eea GetInput.btns
00:1ee2 GetInput.readA 00:1ef7 GetInput.readA
00:1ee6 GetInput.setA 00:1efb GetInput.setA
00:1ef1 GetInput.clearA 00:1f06 GetInput.clearA
00:1ef4 GetInput.readB 00:1f09 GetInput.readB
00:1ef8 GetInput.setB 00:1f0d GetInput.setB
00:1f03 GetInput.clearB 00:1f18 GetInput.clearB
00:1f06 GetInput.readSelect 00:1f1b GetInput.readSelect
00:1f0a GetInput.setSelect 00:1f1f GetInput.setSelect
00:1f15 GetInput.clearSelect 00:1f2a GetInput.clearSelect
00:1f18 GetInput.readStart 00:1f2d GetInput.readStart
00:1f1c GetInput.setStart 00:1f31 GetInput.setStart
00:1f27 GetInput.clearStart 00:1f3c GetInput.clearStart
00:1f2a GetInput.dpad 00:1f3f GetInput.dpad
00:1f37 GetInput.readUp 00:1f4c GetInput.readUp
00:1f3b GetInput.setUp 00:1f50 GetInput.setUp
00:1f46 GetInput.clearUp 00:1f5b GetInput.clearUp
00:1f49 GetInput.readDown 00:1f5e GetInput.readDown
00:1f4d GetInput.setDown 00:1f62 GetInput.setDown
00:1f58 GetInput.clearDown 00:1f6d GetInput.clearDown
00:1f5b GetInput.readLeft 00:1f70 GetInput.readLeft
00:1f5f GetInput.setLeft 00:1f74 GetInput.setLeft
00:1f6a GetInput.clearLeft 00:1f7f GetInput.clearLeft
00:1f6d GetInput.readRight 00:1f82 GetInput.readRight
00:1f71 GetInput.setRight 00:1f86 GetInput.setRight
00:1f7c GetInput.clearRight 00:1f91 GetInput.clearRight
00:1f7f GetInput.priorities 00:1f94 GetInput.priorities
00:1f8a GetInput.zero 00:1f9f GetInput.zero
00:1f90 ScoreInit 00:1fa5 ScoreInit
00:1fb0 IncreaseScore 00:1fc5 IncreaseScore
00:1fe4 IncreaseScore.doConvert 00:1ff9 IncreaseScore.doConvert
00:1ffc IncreaseScore.carry 00:2011 IncreaseScore.carry
00:1ffe IncreaseScore.postConvert 00:2013 IncreaseScore.postConvert
00:2012 IncreaseScore.preAddDigit 00:2027 IncreaseScore.preAddDigit
00:2032 IncreaseScore.addDigit 00:2047 IncreaseScore.addDigit
00:2048 IncreaseScore.nextDigit 00:205d IncreaseScore.nextDigit
00:205c Main 00:2071 Main
00:2071 Main.wvr_u1 00:2086 Main.wvr_u1
00:208a Main.notgbc 00:209f Main.notgbc
00:20b7 Main.nocolortiles 00:20cc Main.nocolortiles
00:20d8 Main.wvb_u2 00:20ed Main.wvb_u2
00:20e3 EventLoop 00:20f8 EventLoop
00:20f9 EventLoop.eventloopjumps 00:210e EventLoop.eventloopjumps
00:2102 EventLoopPostHandler 00:2117 EventLoopPostHandler
00:2104 EventLoopPostHandler.wvb_u3 00:2119 EventLoopPostHandler.wvb_u3
00:2116 EventLoopPostHandler.vblankjumps 00:212b EventLoopPostHandler.vblankjumps
00:211f RestoreSRAM 00:2134 RestoreSRAM
00:2178 InitializeSRAM 00:218d InitializeSRAM
00:21d6 GradeInit 00:21eb GradeInit
00:21e4 UpdateGrade 00:21f9 UpdateGrade
00:21ed UpdateGrade.trygradeup 00:2202 UpdateGrade.trygradeup
00:2207 UpdateGrade.increasegrade 00:221c UpdateGrade.increasegrade
00:221b CheckForGM 00:2230 CheckForGM
00:2231 PrepareScore 00:2246 PrepareScore
00:2248 SwitchToTitle 00:225d SwitchToTitle
00:2252 TitleEventLoopHandler 00:2267 TitleEventLoopHandler
00:225c TitleVBlankHandler 00:2271 TitleVBlankHandler
00:2266 DrawOption6 00:227b DrawOption6
00:22b6 TimeInit 00:22cb TimeInit
00:22cb ResetTime 00:22e0 ResetTime
00:22d6 HandleTimers 00:22eb HandleTimers
00:2303 UnsafeMemCopy 00:2318 UnsafeMemCopy
00:230c SafeMemCopy.wvr_u1 00:2321 SafeMemCopy.wvr_u1
00:230c SafeMemCopy 00:2321 SafeMemCopy
00:231b UnsafeMemSet 00:2330 UnsafeMemSet
00:2323 SafeMemSet 00:2338 SafeMemSet
00:2323 SafeMemSet.wvr_u2 00:2338 SafeMemSet.wvr_u2
00:2331 SwitchToGameplay 00:2346 SwitchToGameplay
00:233b SwitchToGameplayBig 00:2350 SwitchToGameplayBig
00:2345 GamePlayEventLoopHandler 00:235a GamePlayEventLoopHandler
00:234f GamePlayBigEventLoopHandler 00:2364 GamePlayBigEventLoopHandler
00:2359 sGradeScores 00:236e sGradeScores
00:237b CopyOAMHandler 00:2390 CopyOAMHandler
00:2387 ClearOAM 00:239c ClearOAM
00:239d IntrInit 00:23b2 IntrInit
00:23a1 InitializeLCDCInterrupt 00:23b6 InitializeLCDCInterrupt
00:23b6 OAMDMA 00:23cb OAMDMA
00:23c0 OAMDMAEnd 00:23d5 OAMDMAEnd
01:4008 sDMGTSpeedCurve 01:4008 sDMGTSpeedCurve
01:4210 sDMGTSpeedCurveEnd 01:4210 sDMGTSpeedCurveEnd
01:4212 sTGM1SpeedCurve 01:4212 sTGM1SpeedCurve
@ -277,13 +277,15 @@
02:5e72 sSFXLevelUpEnd 02:5e72 sSFXLevelUpEnd
02:5fcd sSFXReadyGo 02:5fcd sSFXReadyGo
02:5fcd sSFXRankUpEnd 02:5fcd sSFXRankUpEnd
02:673b sSFXLineClear 02:673b sSFXRankGM
02:673b sSFXReadyGoEnd 02:673b sSFXReadyGoEnd
02:6751 sSFXLand 02:6b80 sSFXLineClear
02:6751 sSFXLineClearEnd 02:6b80 sSFXRankGMEnd
02:675c sSFXLock 02:6b96 sSFXLand
02:675c sSFXLandEnd 02:6b96 sSFXLineClearEnd
02:67d2 sSFXLockEnd 02:6ba1 sSFXLock
02:6ba1 sSFXLandEnd
02:6c17 sSFXLockEnd
03:4008 sMusicMenu 03:4008 sMusicMenu
03:681b sMusicMenuEnd 03:681b sMusicMenuEnd
04:4008 SwitchToTitleB 04:4008 SwitchToTitleB

View File

@ -140,7 +140,7 @@ CheckForGM:
ld [wDisplayedGrade], a ld [wDisplayedGrade], a
; Sound effect ; Sound effect
ld a, SFX_RANKUP ld a, SFX_RANKGM
jp SFXEnqueue jp SFXEnqueue

View File

@ -199,6 +199,7 @@ DEF SFX_LEVELLOCK EQU 14
DEF SFX_LEVELUP EQU 15 DEF SFX_LEVELUP EQU 15
DEF SFX_RANKUP EQU 16 DEF SFX_RANKUP EQU 16
DEF SFX_READYGO EQU 17 DEF SFX_READYGO EQU 17
DEF SFX_RANKGM EQU 18
DEF MUSIC_MENU EQU $EE DEF MUSIC_MENU EQU $EE
; Tile data offsets ; Tile data offsets

View File

@ -194,7 +194,7 @@ LevelUp::
ld a, h ld a, h
ldh [hLevel+1], a ldh [hLevel+1], a
call DoSpeedUp call DoSpeedUp
ld a, SFX_RANKUP ld a, SFX_RANKGM
jp SFXEnqueue jp SFXEnqueue
.checknlevel .checknlevel

View File

@ -1961,6 +1961,347 @@ sSFXReadyGo::
db REG_NR22_CH2_VOLEV, $09, REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08, REG_NR22_CH2_VOLEV, $09 db REG_NR22_CH2_VOLEV, $09, REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08, REG_NR22_CH2_VOLEV, $09
db REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08, $FE db REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08, $FE
sSFXReadyGoEnd:: sSFXReadyGoEnd::
sSFXRankGM::
db REG_NR12_CH1_VOLEV, $A5, REG_NR22_CH2_VOLEV, $A5, REG_NR32_CH3_VOLUM, $20, REG_NR11_CH1_LENDT, $7F
db REG_NR11_CH1_LENDT, $7F, REG_NR12_CH1_VOLEV, $A5, REG_NR13_CH1_FRQLO, $2D, REG_NR14_CH1_FRQHI, $87
db REG_NR21_CH2_LENDT, $7F, REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $A5, REG_NR23_CH2_FRQLO, $5B
db REG_NR24_CH2_FRQHI, $86, REG_NR30_CH3_DACEN, $00, REG_WAVE_PATTERN_0, $11, REG_WAVE_PATTERN_1, $23
db REG_WAVE_PATTERN_2, $45, REG_WAVE_PATTERN_3, $67, REG_WAVE_PATTERN_4, $89, REG_WAVE_PATTERN_5, $AB
db REG_WAVE_PATTERN_6, $CD, REG_WAVE_PATTERN_7, $EF, REG_WAVE_PATTERN_8, $FF, REG_WAVE_PATTERN_9, $FE
db REG_WAVE_PATTERN_A, $DC, REG_WAVE_PATTERN_B, $BA, REG_WAVE_PATTERN_C, $98, REG_WAVE_PATTERN_D, $76
db REG_WAVE_PATTERN_E, $54, REG_WAVE_PATTERN_F, $32, REG_NR30_CH3_DACEN, $00, REG_NR30_CH3_DACEN, $80
db REG_NR32_CH3_VOLUM, $20, REG_NR33_CH3_FRQLO, $11, REG_NR34_CH3_FRQHI, $85, $FF
db REG_NR23_CH2_FRQLO, $C4, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $06, REG_NR24_CH2_FRQHI, $07, $FF
db REG_NR23_CH2_FRQLO, $5B, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $C4, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $06, REG_NR24_CH2_FRQHI, $07, $FF
db REG_NR23_CH2_FRQLO, $5B, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $C4, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F, REG_NR12_CH1_VOLEV, $85, REG_NR13_CH1_FRQLO, $2D
db REG_NR14_CH1_FRQHI, $87, REG_NR21_CH2_LENDT, $7F, REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $F5
db REG_NR23_CH2_FRQLO, $06, REG_NR24_CH2_FRQHI, $87, REG_NR30_CH3_DACEN, $00, REG_NR30_CH3_DACEN, $80
db REG_NR32_CH3_VOLUM, $20, REG_NR33_CH3_FRQLO, $0B, REG_NR34_CH3_FRQHI, $86, $FF
db REG_NR23_CH2_FRQLO, $5B, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $C4, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $06, REG_NR24_CH2_FRQHI, $07, $FF
db REG_NR23_CH2_FRQLO, $5B, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $C4, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $06, REG_NR24_CH2_FRQHI, $07, $FF
db REG_NR23_CH2_FRQLO, $5B, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F, REG_NR12_CH1_VOLEV, $85, REG_NR13_CH1_FRQLO, $2D
db REG_NR14_CH1_FRQHI, $87, REG_NR21_CH2_LENDT, $7F, REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $F5
db REG_NR23_CH2_FRQLO, $C4, REG_NR24_CH2_FRQHI, $86, REG_NR30_CH3_DACEN, $00, REG_NR30_CH3_DACEN, $80
db REG_NR32_CH3_VOLUM, $20, REG_NR33_CH3_FRQLO, $89, REG_NR34_CH3_FRQHI, $86, $FF
db REG_NR23_CH2_FRQLO, $06, REG_NR24_CH2_FRQHI, $07, $FF
db REG_NR23_CH2_FRQLO, $5B, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $C4, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $06, REG_NR24_CH2_FRQHI, $07, $FF
db REG_NR23_CH2_FRQLO, $5B, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $C4, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $06, REG_NR24_CH2_FRQHI, $07, $FF
db REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F, REG_NR12_CH1_VOLEV, $85, REG_NR13_CH1_FRQLO, $21
db REG_NR14_CH1_FRQHI, $87, REG_NR21_CH2_LENDT, $7F, REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $F5
db REG_NR23_CH2_FRQLO, $42, REG_NR24_CH2_FRQHI, $86, REG_NR30_CH3_DACEN, $00, REG_NR30_CH3_DACEN, $80
db REG_NR32_CH3_VOLUM, $20, REG_NR33_CH3_FRQLO, $63, REG_NR34_CH3_FRQHI, $85, $FF
db REG_NR23_CH2_FRQLO, $B2, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $F7, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $42, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $B2, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $F7, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $42, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $B2, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $F7, REG_NR24_CH2_FRQHI, $06, REG_NR30_CH3_DACEN, $00, REG_NR30_CH3_DACEN, $80
db REG_NR32_CH3_VOLUM, $20, REG_NR33_CH3_FRQLO, $42, REG_NR34_CH3_FRQHI, $86, $FF
db REG_NR23_CH2_FRQLO, $42, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $B2, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $F7, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $42, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $B2, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $F7, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $42, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $B2, REG_NR24_CH2_FRQHI, $06, REG_NR30_CH3_DACEN, $00, REG_NR30_CH3_DACEN, $80
db REG_NR32_CH3_VOLUM, $20, REG_NR33_CH3_FRQLO, $B2, REG_NR34_CH3_FRQHI, $86, $FF
db REG_NR23_CH2_FRQLO, $F7, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $42, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $B2, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $F7, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $42, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $B2, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $F7, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F, REG_NR12_CH1_VOLEV, $85, REG_NR13_CH1_FRQLO, $2D
db REG_NR14_CH1_FRQHI, $87, REG_NR21_CH2_LENDT, $7F, REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $F5
db REG_NR23_CH2_FRQLO, $5B, REG_NR24_CH2_FRQHI, $86, REG_NR30_CH3_DACEN, $00, REG_NR30_CH3_DACEN, $80
db REG_NR32_CH3_VOLUM, $20, REG_NR33_CH3_FRQLO, $89, REG_NR34_CH3_FRQHI, $85, $FF
db REG_NR23_CH2_FRQLO, $C4, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $06, REG_NR24_CH2_FRQHI, $07, $FF
db REG_NR23_CH2_FRQLO, $5B, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $C4, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $06, REG_NR24_CH2_FRQHI, $07, $FF
db REG_NR23_CH2_FRQLO, $5B, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $C4, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $06, REG_NR24_CH2_FRQHI, $07, REG_NR30_CH3_DACEN, $00, REG_NR30_CH3_DACEN, $80
db REG_NR32_CH3_VOLUM, $20, REG_NR33_CH3_FRQLO, $5B, REG_NR34_CH3_FRQHI, $86, $FF
db REG_NR23_CH2_FRQLO, $5B, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $C4, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $06, REG_NR24_CH2_FRQHI, $07, $FF
db REG_NR23_CH2_FRQLO, $5B, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $C4, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $06, REG_NR24_CH2_FRQHI, $07, $FF
db REG_NR23_CH2_FRQLO, $5B, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $C4, REG_NR24_CH2_FRQHI, $06, REG_NR30_CH3_DACEN, $00, REG_NR30_CH3_DACEN, $80
db REG_NR32_CH3_VOLUM, $20, REG_NR33_CH3_FRQLO, $C4, REG_NR34_CH3_FRQHI, $86, $FF
db REG_NR23_CH2_FRQLO, $06, REG_NR24_CH2_FRQHI, $07, $FF
db REG_NR23_CH2_FRQLO, $5B, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $C4, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $06, REG_NR24_CH2_FRQHI, $07, $FF
db REG_NR23_CH2_FRQLO, $5B, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $C4, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $06, REG_NR24_CH2_FRQHI, $07, $FF
db REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F, REG_NR12_CH1_VOLEV, $85, REG_NR13_CH1_FRQLO, $44
db REG_NR14_CH1_FRQHI, $87, REG_NR21_CH2_LENDT, $7F, REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $F5
db REG_NR23_CH2_FRQLO, $89, REG_NR24_CH2_FRQHI, $86, REG_NR30_CH3_DACEN, $00, REG_NR30_CH3_DACEN, $80
db REG_NR32_CH3_VOLUM, $20, REG_NR33_CH3_FRQLO, $CE, REG_NR34_CH3_FRQHI, $85, $FF
db REG_NR23_CH2_FRQLO, $E7, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $21, REG_NR24_CH2_FRQHI, $07, $FF
db REG_NR23_CH2_FRQLO, $89, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $E7, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $21, REG_NR24_CH2_FRQHI, $07, $FF
db REG_NR23_CH2_FRQLO, $89, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $E7, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $21, REG_NR24_CH2_FRQHI, $07, REG_NR30_CH3_DACEN, $00, REG_NR30_CH3_DACEN, $80
db REG_NR32_CH3_VOLUM, $20, REG_NR33_CH3_FRQLO, $89, REG_NR34_CH3_FRQHI, $86, $FF
db REG_NR23_CH2_FRQLO, $89, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $E7, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $21, REG_NR24_CH2_FRQHI, $07, $FF
db REG_NR23_CH2_FRQLO, $89, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $E7, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $21, REG_NR24_CH2_FRQHI, $07, $FF
db REG_NR23_CH2_FRQLO, $89, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $E7, REG_NR24_CH2_FRQHI, $06, REG_NR30_CH3_DACEN, $00, REG_NR30_CH3_DACEN, $80
db REG_NR32_CH3_VOLUM, $20, REG_NR33_CH3_FRQLO, $CE, REG_NR34_CH3_FRQHI, $85, $FF
db REG_NR23_CH2_FRQLO, $21, REG_NR24_CH2_FRQHI, $07, $FF
db REG_NR23_CH2_FRQLO, $89, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $E7, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $21, REG_NR24_CH2_FRQHI, $07, $FF
db REG_NR23_CH2_FRQLO, $89, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $E7, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $21, REG_NR24_CH2_FRQHI, $07, $FF
db REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F, REG_NR12_CH1_VOLEV, $65, REG_NR13_CH1_FRQLO, $59
db REG_NR14_CH1_FRQHI, $87, REG_NR21_CH2_LENDT, $7F, REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $D5
db REG_NR23_CH2_FRQLO, $B2, REG_NR24_CH2_FRQHI, $86, REG_NR30_CH3_DACEN, $00, REG_NR30_CH3_DACEN, $80
db REG_NR32_CH3_VOLUM, $20, REG_NR33_CH3_FRQLO, $16, REG_NR34_CH3_FRQHI, $84, $FF
db REG_NR23_CH2_FRQLO, $06, REG_NR24_CH2_FRQHI, $07, $FF
db REG_NR23_CH2_FRQLO, $39, REG_NR24_CH2_FRQHI, $07, $FF
db REG_NR23_CH2_FRQLO, $B2, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $06, REG_NR24_CH2_FRQHI, $07, $FF
db REG_NR23_CH2_FRQLO, $39, REG_NR24_CH2_FRQHI, $07, $FF
db REG_NR23_CH2_FRQLO, $B2, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $06, REG_NR24_CH2_FRQHI, $07, $FF
db REG_NR23_CH2_FRQLO, $39, REG_NR24_CH2_FRQHI, $07, $FF
db REG_NR23_CH2_FRQLO, $B2, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $06, REG_NR24_CH2_FRQHI, $07, $FF
db REG_NR23_CH2_FRQLO, $39, REG_NR24_CH2_FRQHI, $07, $FF
db REG_NR23_CH2_FRQLO, $B2, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $06, REG_NR24_CH2_FRQHI, $07, $FF
db REG_NR23_CH2_FRQLO, $39, REG_NR24_CH2_FRQHI, $07, $FF
db REG_NR23_CH2_FRQLO, $B2, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR32_CH3_VOLUM, $20, REG_NR23_CH2_FRQLO, $06, REG_NR24_CH2_FRQHI, $07, $FF
db REG_NR32_CH3_VOLUM, $20, REG_NR23_CH2_FRQLO, $39, REG_NR24_CH2_FRQHI, $07, $FF
db REG_NR32_CH3_VOLUM, $20, REG_NR23_CH2_FRQLO, $B2, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR32_CH3_VOLUM, $40, REG_NR23_CH2_FRQLO, $06, REG_NR24_CH2_FRQHI, $07, $FF
db REG_NR32_CH3_VOLUM, $40, REG_NR23_CH2_FRQLO, $39, REG_NR24_CH2_FRQHI, $07, $FF
db REG_NR32_CH3_VOLUM, $40, REG_NR23_CH2_FRQLO, $B2, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR32_CH3_VOLUM, $40, REG_NR23_CH2_FRQLO, $06, REG_NR24_CH2_FRQHI, $07, $FF
db REG_NR32_CH3_VOLUM, $60, REG_NR23_CH2_FRQLO, $39, REG_NR24_CH2_FRQHI, $07, $FF
db REG_NR32_CH3_VOLUM, $60, REG_NR23_CH2_FRQLO, $B2, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR32_CH3_VOLUM, $60, REG_NR23_CH2_FRQLO, $06, REG_NR24_CH2_FRQHI, $07, $FF
db REG_NR32_CH3_VOLUM, $60, REG_NR23_CH2_FRQLO, $39, REG_NR24_CH2_FRQHI, $07, $FF
db REG_NR32_CH3_VOLUM, $00, REG_NR23_CH2_FRQLO, $B2, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR32_CH3_VOLUM, $00, REG_NR23_CH2_FRQLO, $06, REG_NR24_CH2_FRQHI, $07, $FF
db REG_NR32_CH3_VOLUM, $00, REG_NR23_CH2_FRQLO, $39, REG_NR24_CH2_FRQHI, $07, $FF
db REG_NR32_CH3_VOLUM, $00, REG_NR23_CH2_FRQLO, $B2, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR32_CH3_VOLUM, $00, REG_NR23_CH2_FRQLO, $06, REG_NR24_CH2_FRQHI, $07, $FF
db REG_NR23_CH2_FRQLO, $39, REG_NR24_CH2_FRQHI, $07, $FF
db REG_NR23_CH2_FRQLO, $B2, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $06, REG_NR24_CH2_FRQHI, $07, $FF
db REG_NR23_CH2_FRQLO, $39, REG_NR24_CH2_FRQHI, $07, $FF
db REG_NR23_CH2_FRQLO, $B2, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $06, REG_NR24_CH2_FRQHI, $07, $FF
db REG_NR23_CH2_FRQLO, $39, REG_NR24_CH2_FRQHI, $07, $FF
db REG_NR23_CH2_FRQLO, $B2, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $06, REG_NR24_CH2_FRQHI, $07, $FF
db REG_NR23_CH2_FRQLO, $39, REG_NR24_CH2_FRQHI, $07, $FF
db REG_NR23_CH2_FRQLO, $B2, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $06, REG_NR24_CH2_FRQHI, $07, $FF
db REG_NR23_CH2_FRQLO, $39, REG_NR24_CH2_FRQHI, $07, $FF
db REG_NR23_CH2_FRQLO, $B2, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $06, REG_NR24_CH2_FRQHI, $07, $FF
db REG_NR23_CH2_FRQLO, $39, REG_NR24_CH2_FRQHI, $07, $FF
db REG_NR23_CH2_FRQLO, $B2, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $06, REG_NR24_CH2_FRQHI, $07, $FF
db REG_NR23_CH2_FRQLO, $39, REG_NR24_CH2_FRQHI, $07, $FF
db REG_NR23_CH2_FRQLO, $B2, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $06, REG_NR24_CH2_FRQHI, $07, $FF
db REG_NR23_CH2_FRQLO, $39, REG_NR24_CH2_FRQHI, $07, $FF
db REG_NR23_CH2_FRQLO, $B2, REG_NR24_CH2_FRQHI, $06, $FF
db REG_NR23_CH2_FRQLO, $06, REG_NR24_CH2_FRQHI, $07, $FF
db REG_NR12_CH1_VOLEV, $08, REG_NR13_CH1_FRQLO, $59, REG_NR14_CH1_FRQHI, $87, REG_NR22_CH2_VOLEV, $08
db REG_NR23_CH2_FRQLO, $B2, REG_NR24_CH2_FRQHI, $86, REG_NR32_CH3_VOLUM, $00, REG_NR33_CH3_FRQLO, $16
db REG_NR34_CH3_FRQHI, $04, $FE
sSFXRankGMEnd::
; These sound effects contain only noise. ; These sound effects contain only noise.
sSFXLineClear:: sSFXLineClear::
@ -2020,4 +2361,5 @@ sSFXLock::
db REG_NR43_CH4_FQRND, $00, REG_NR44_CH4_CNTRL, $00, $FE db REG_NR43_CH4_FQRND, $00, REG_NR44_CH4_CNTRL, $00, $FE
sSFXLockEnd:: sSFXLockEnd::
ENDC ENDC

Binary file not shown.

Binary file not shown.

View File

@ -188,6 +188,7 @@ sfx_names = [
"sSFXLevelUp", "sSFXLevelUp",
"sSFXRankUp", "sSFXRankUp",
"sSFXReadyGo", "sSFXReadyGo",
"sSFXRankGM"
] ]
def chunks(lst, n): def chunks(lst, n):

View File

@ -187,7 +187,7 @@ IncreaseScore::
; If it has, reset the score. ; If it has, reset the score.
xor a, a xor a, a
ldh [hScore], a ldh [hScore], a
ld a, SFX_RANKUP ld a, SFX_RANKGM
jp SFXEnqueue jp SFXEnqueue

View File

@ -154,6 +154,8 @@ SFXEnqueue::
ldh a, [hCurrentlyPlaying] ldh a, [hCurrentlyPlaying]
cp a, SFX_RANKUP cp a, SFX_RANKUP
ret z ret z
cp a, SFX_RANKGM
ret z
; If the playhead isn't null, then we're already playing something. ; If the playhead isn't null, then we're already playing something.
ldh a, [hPlayhead] ldh a, [hPlayhead]
@ -331,7 +333,7 @@ SFXEnqueue::
ldh [hPlayhead], a ldh [hPlayhead], a
ld a, HIGH(sSFXLevelLock) ld a, HIGH(sSFXLevelLock)
ldh [hPlayhead+1], a ldh [hPlayhead+1], a
jr SFXPlay jp SFXPlay
: cp a, SFX_LEVELUP : cp a, SFX_LEVELUP
jr nz, :+ jr nz, :+
@ -350,6 +352,14 @@ SFXEnqueue::
ldh [hPlayhead+1], a ldh [hPlayhead+1], a
jr SFXPlay jr SFXPlay
: cp a, SFX_RANKGM
jr nz, :+
ld a, LOW(sSFXRankGM)
ldh [hPlayhead], a
ld a, HIGH(sSFXRankGM)
ldh [hPlayhead+1], a
jr SFXPlay
: cp a, SFX_READYGO : cp a, SFX_READYGO
ret nz ret nz
ld a, LOW(sSFXReadyGo) ld a, LOW(sSFXReadyGo)
@ -365,6 +375,8 @@ SFXKill::
ldh a, [hCurrentlyPlaying] ldh a, [hCurrentlyPlaying]
cp a, SFX_RANKUP cp a, SFX_RANKUP
ret z ret z
cp a, SFX_RANKGM
ret z
; Kill all sound without pops. ; Kill all sound without pops.
ld a, %00111111 ld a, %00111111