From 3f0082a77175e731b1cfd622c30f41c4cbc47d34 Mon Sep 17 00:00:00 2001 From: aerinon Date: Wed, 20 Sep 2023 13:39:19 -0600 Subject: [PATCH] Fix merge error on hera boss music --- music.asm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/music.asm b/music.asm index 2586b63..901a7a7 100644 --- a/music.asm +++ b/music.asm @@ -282,6 +282,7 @@ Underworld_DoorDown_Entry: ;-------------------------------------------------------------------------------- ; Check if the boss in ToH has been defeated (16-bit accumulator) CheckHeraBossDefeated: - LDA.l RoomDataWRAM[$07].l : AND.w #$FF00 - RTL +LDA RoomDataWRAM[$07].high : AND.w #$00FF : BEQ + + SEC : RTL ++ CLC : RTL ;--------------------------------------------------------------------------------