From c7718e7a472434d06737985b80d8d445ca014e82 Mon Sep 17 00:00:00 2001 From: codemann8 Date: Wed, 19 Jan 2022 14:39:19 -0600 Subject: [PATCH] Fixed Hera boss music to correctly read boss defeated flag --- hooks.asm | 4 ++-- music.asm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hooks.asm b/hooks.asm index 1f15ee1..ddeeadd 100755 --- a/hooks.asm +++ b/hooks.asm @@ -1916,10 +1916,10 @@ NOP #8 ;JSL.l OnLoadMap ;================================================================================ org $028B8F ; <- 10B8F - Bank02.asm:2236 (LDA $7EF374 : LSR A) -JSL Hera_Boss_Defeated : NOP +JSL CheckHeraBossDefeated : NOP ;================================================================================ org $029090 ; <- 11090 - Bank02.asm:3099 (LDA $7EF374 : LSR A) -JSL Hera_Boss_Defeated : NOP +JSL CheckHeraBossDefeated : NOP ;================================================================================ org $029798 ; <- 11798 - Bank02.asm:4287 (CMP $02895C, X : BNE BRANCH_ALPHA) NOP #6 ; remove crystal room cutscene check that causes softlocks diff --git a/music.asm b/music.asm index 288e1b0..d69b416 100644 --- a/music.asm +++ b/music.asm @@ -209,7 +209,7 @@ Underworld_DoorDown_Entry: ; This is for changing to/from ToH dungeon/boss music ; ; A=16bit XY=8bit -Hera_Boss_Defeated: +CheckHeraBossDefeated: LDA $7EF00F : AND.w #$00FF : BEQ + SEC : RTL + CLC : RTL