alttpr-gwaa-kiwi/alttpr-baserom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Undo MSU Kak Music Fix

Browse Source
This commit is contained in:
codemann8
2025-06-12 00:54:23 -05:00
parent d19e22cc7d
commit 4088698af9
3 changed files with 5 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
events.asm
View File

@@ -60,12 +60,6 @@ OnDungeonExit:
JSL SetSilverBowMode JSL SetSilverBowMode
PLP : PLA PLP : PLA
RTL RTL
;--------------------------------------------------------------------------------
OnSave:
JSL MSUResumeReset
REP #$30 : LDX.w #$0002
RTL
;--------------------------------------------------------------------------------
OnQuit: OnQuit:
JSL SQEGFix JSL SQEGFix
LDA.b #$00 : STA.l AltTextFlag ; bandaid patch bug with mirroring away from text LDA.b #$00 : STA.l AltTextFlag ; bandaid patch bug with mirroring away from text

4
hooks.asm
View File

@@ -366,8 +366,8 @@ BRA AfterFileWrittenChecks
org $80881F ; <- Bank00.asm : 1011 (STY $01FE) org $80881F ; <- Bank00.asm : 1011 (STY $01FE)
AfterFileWrittenChecks: AfterFileWrittenChecks:
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
org $80894F ; <- Bank00.asm : 1278 (LDX $1FFE : LDA $00848A, X : TAY : PHY) org $808951 ; <- Bank00.asm : 1278 (LDX $1FFE : LDA $00848A, X : TAY : PHY)
JSL OnSave : NOP LDX.w #$0002
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
org $8CCE85 ; <- Bank0C.asm : 1953 (LDA $C8 : ASL A : INC #2 : STA $701FFE) org $8CCE85 ; <- Bank0C.asm : 1953 (LDA $C8 : ASL A : INC #2 : STA $701FFE)
NOP #4 NOP #4

15
msu.asm
View File

@@ -429,7 +429,9 @@ MSUInit:
LDA.b #$00 LDA.b #$00
STA.l MSULoadedTrack STA.l MSULoadedTrack
JSL MSUResumeReset STA.l MSUResumeTrack
STA.l MSUResumeTime : STA.l MSUResumeTime+1 : STA.l MSUResumeTime+2 : STA.l MSUResumeTime+3
STA.l MSUResumeControl
LDA.l NoBGM : BNE .done LDA.l NoBGM : BNE .done
@@ -494,17 +496,6 @@ MSUInit:
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
;================================================================================
; Purge MSU Resume values
;--------------------------------------------------------------------------------
MSUResumeReset:
LDA.b #$00
STA.l MSUResumeTrack
STA.l MSUResumeTime : STA.l MSUResumeTime+1 : STA.l MSUResumeTime+2 : STA.l MSUResumeTime+3
STA.l MSUResumeControl
RTL
;--------------------------------------------------------------------------------
;================================================================================ ;================================================================================
; Stop MSU-1 audio track and save the current position when approriate ; Stop MSU-1 audio track and save the current position when approriate
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------