Merge pull request #18 from KevinCathcart/SoundFixes

Fix ER music bugs
This commit is contained in:
Karkat
2018-01-21 21:11:22 -05:00
committed by GitHub
3 changed files with 103 additions and 0 deletions

View File

@@ -1943,6 +1943,19 @@ JSL.l WalkDownIntoTavern
NOP #1
;================================================================================
;================================================================================
; Music fixes
;--------------------------------------------------------------------------------
org $0282F4 ; <- Bank02.asm:654 (LDY.b #$58 ...)
JML.l PreOverworld_LoadProperties_ChooseMusic
org $028389 ; <- Bank02.asm:763
PreOverworld_LoadProperties_SetSong:
;--------------------------------------------------------------------------------
org $05CC58 ; <- Bank05.asm:1307 (LDA $040A : CMP.b #$18)
JSL PsychoSolder_MusicCheck
NOP #1
;================================================================================
;================================================================================
; Hooks for roomloading.asm
;--------------------------------------------------------------------------------