alttpr-gwaa-kiwi/alttpr-baserom
1
0
Fork 0
Code Pull Requests 1 Releases Activity

Properly reload expanded MSU-1 tracks after fairy revival

Browse Source
This commit is contained in:
qwertymodo
2019-11-09 11:45:20 -08:00
parent 63543f54e3
commit 57f82dc78f
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
hooks.asm
View File

@@ -1473,6 +1473,9 @@ crystal_continue:
org $0988A0 ; <- 8D2C01 8009 - ancilla_init.asm:1179 (STA $012C : BRA .doneWithSoundEffects) org $0988A0 ; <- 8D2C01 8009 - ancilla_init.asm:1179 (STA $012C : BRA .doneWithSoundEffects)
JML fanfare_preload : NOP 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) org $0CC100 ; <- A511 C904 - Bank0C.asm:07 (LDA $11 : CMP.b #$04)
JSL.l startup_wait JSL.l startup_wait

7
msu.asm
View File

@@ -372,6 +372,13 @@ SpiralStairsPostCheck:
LDX.b #$1C : LDA $A0 ; thing we wrote over LDX.b #$1C : LDA $A0 ; thing we wrote over
RTL 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: msu_init:
PHP PHP