Merge branch 'DRUnstable' into Enemizer

# Conflicts:
#	keydrop/standing_items.asm

doorrando/doorrando.asm

@@ -41,6 +41,11 @@ DRScroll:
 db 0
 OffsetTable:
 dw -8, 8
+org $A78010
+DRVersionInfo:
+dw $0000, $0000, $0000, $0000, $0000, $0000, $0000, $0000
+
+org $A78020
 
 incsrc normal.asm
 incsrc scroll.asm

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

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
 }