diff --git a/hooks.asm b/hooks.asm index 9b68d7c..1f15ee1 100755 --- a/hooks.asm +++ b/hooks.asm @@ -1915,15 +1915,11 @@ NOP #8 ;org $0AC012 ; <- 54012 - Bank0A.asm:1039 - (LDA $7EF2DB) ;JSL.l OnLoadMap ;================================================================================ -org $028B8F ; <- 10B8F - Bank02.asm:2236 (LDA $7EF374 : LSR A : BCS BRANCH_BETA) -LDA $7EF00F : BNE + : NOP -LDX.b #$F1 : STX $012C -+ +org $028B8F ; <- 10B8F - Bank02.asm:2236 (LDA $7EF374 : LSR A) +JSL Hera_Boss_Defeated : NOP ;================================================================================ -org $029090 ; <- 11090 - Bank02.asm:3099 (LDA $7EF374 : LSR A : BCS BRANCH_GAMMA) -LDA $7EF00F : BNE + : NOP -STX $012C ; DON'T MOVE THIS FORWARD OR MADNESS AWAITS -+ +org $029090 ; <- 11090 - Bank02.asm:3099 (LDA $7EF374 : LSR A) +JSL Hera_Boss_Defeated : 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 3b1b120..288e1b0 100644 --- a/music.asm +++ b/music.asm @@ -206,3 +206,10 @@ Underworld_DoorDown_Entry: .done LDA $A0 : RTL ;-------------------------------------------------------------------------------- +; This is for changing to/from ToH dungeon/boss music +; +; A=16bit XY=8bit +Hera_Boss_Defeated: +LDA $7EF00F : AND.w #$00FF : BEQ + + SEC : RTL ++ CLC : RTL