diff --git a/LTTP_RND_GeneralBugfixes.asm b/LTTP_RND_GeneralBugfixes.asm index a45188f..0fd3206 100644 --- a/LTTP_RND_GeneralBugfixes.asm +++ b/LTTP_RND_GeneralBugfixes.asm @@ -514,6 +514,9 @@ Module_PreDungeon: org $028296 .setAmbientSfx +org $828AD9 +Underworld_SetBossOrSancMusicUponEntry: + org $02A0A8 Dungeon_SaveRoomData: diff --git a/doorrando/drhooks.asm b/doorrando/drhooks.asm index dc910e3..0a8d5a9 100644 --- a/doorrando/drhooks.asm +++ b/doorrando/drhooks.asm @@ -192,10 +192,9 @@ JSL.l Underworld_DoorDown_Entry : CPX #$FF BEQ + : db $80, $1C ; BRA $028B04 NOP #6 : + -org $82C3F2 ; <- Bank02.asm:10521 Unused call -Underworld_DoorDown_Call: -org $82C3F3 -dw $8AD9 ; address of Bank02.asm:2085 +org $82FD00 ; unreachable code +Underworld_SetBossOrSancMusicUponEntry_long: +JSR Underworld_SetBossOrSancMusicUponEntry : RTL org $81AA90 JSL BigKeyDoorCheck : NOP diff --git a/doorrando/normal.asm b/doorrando/normal.asm index 5a07bba..9352837 100644 --- a/doorrando/normal.asm +++ b/doorrando/normal.asm @@ -412,7 +412,7 @@ StraightStairsTrapDoor: .animateTraps lda #$05 : sta $11 inc $0468 : stz $068e : stz $0690 - ++ JSL Underworld_DoorDown_Call : rtl + ++ JML Underworld_SetBossOrSancMusicUponEntry_long + JML Dungeon_ApproachFixedColor ; what we wrote over }