diff --git a/hooks.asm b/hooks.asm index efaa51c..f542af7 100755 --- a/hooks.asm +++ b/hooks.asm @@ -1473,6 +1473,9 @@ crystal_continue: org $0988A0 ; <- 8D2C01 8009 - ancilla_init.asm:1179 (STA $012C : BRA .doneWithSoundEffects) JML fanfare_preload : NOP +org $09F2A7 ; <- 8F27C27E - module_death.asm:56 (STA $7EC227) +JSL.l StoreMusicOnDeath + org $0CC100 ; <- A511 C904 - Bank0C.asm:07 (LDA $11 : CMP.b #$04) JSL.l startup_wait diff --git a/msu.asm b/msu.asm index 5a601a5..7723f44 100644 --- a/msu.asm +++ b/msu.asm @@ -372,6 +372,13 @@ SpiralStairsPostCheck: LDX.b #$1C : LDA $A0 ; thing we wrote over RTL +StoreMusicOnDeath: + STA.l $7EC227 ; thing we wrote over + LDA !REG_MSU_STATUS : BIT !FLAG_MSU_STATUS_AUDIO_PLAYING : BEQ .done + LDA !REG_CURRENT_MSU_TRACK : STA.l $7EC227 +.done + RTL + msu_init: PHP