From 4a9f86ba85d2037adef5d5fcd433e76be071b715 Mon Sep 17 00:00:00 2001 From: Thomas Prescott Date: Fri, 17 Jul 2020 06:14:09 -0500 Subject: [PATCH 1/2] Uncomment PostNMIHookAction --- hooks.asm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hooks.asm b/hooks.asm index 97e5905..99d42e1 100755 --- a/hooks.asm +++ b/hooks.asm @@ -23,9 +23,9 @@ JML.l NMIHookAction org $0080D0 ; <- D0 - Bank00.asm : 164 (PHA : PHX : PHY : PHD : PHB) NMIHookReturn: ;-------------------------------------------------------------------------------- -;org $00821B ; <- 21B - Bank00.asm : 329 (LDA $13 : STA $2100) -;JML.l PostNMIHookAction : NOP -;PostNMIHookReturn: +org $00821B ; <- 21B - Bank00.asm : 329 (LDA $13 : STA $2100) +JML.l PostNMIHookAction : NOP +PostNMIHookReturn: ;-------------------------------------------------------------------------------- ;================================================================================ From 5930406ecbacdd85b99208cefc80a04dd8f52581 Mon Sep 17 00:00:00 2001 From: Thomas Prescott Date: Fri, 17 Jul 2020 06:18:11 -0500 Subject: [PATCH 2/2] Fix S&Q crash for certain SNES users This was suggested by Kat, and seemed to work for a player who had been experiencing chronic game crashes during an S&Q. --- msu.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/msu.asm b/msu.asm index 0333c20..4af1caf 100644 --- a/msu.asm +++ b/msu.asm @@ -326,7 +326,7 @@ CheckMusicLoadRequest: .sfx_indoors LDA !REG_MUSIC_CONTROL_REQUEST : STA !REG_MUSIC_CONTROL : STZ !REG_MUSIC_CONTROL_REQUEST PLY : PLX : PLA : PLP - LDA.b #$05 : STA $012D + PHP : SEP #$20 : LDA.b #$05 : STA $012D : PLP JML Module_PreDungeon_setAmbientSfx ;--------------------------------------------------------------------------------