Moving some hijacked DR code to new location

2023-03-17 20:06:56 -05:00
parent 8d3e084c1d
commit ee4fce4010
3 changed files with 7 additions and 5 deletions
--- 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:

--- 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
--- 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
 }