Merge branch 'DRUnstable' into Enemizer

# Conflicts:
#	keydrop/standing_items.asm

LTTP_RND_GeneralBugfixes.asm

@@ -512,6 +512,9 @@ Module_PreDungeon:
 org $028296
     .setAmbientSfx
 
+org $828AD9
+Underworld_SetBossOrSancMusicUponEntry:
+
 org $02A0A8
 Dungeon_SaveRoomData:
 

darkworldspawn.asm

@@ -114,17 +114,23 @@ RefreshRainAmmo:
 		+ CMP.b #$03 : BNE + ; Uncle
 			%SetMinimum(CurrentMagic,MagicFiller,RainDeathRefillMagic_Uncle)
 			%SetMinimum(BombsEquipment,BombsFiller,RainDeathRefillBombs_Uncle)
-			%SetMinimum(CurrentArrows,ArrowsFiller,RainDeathRefillArrows_Uncle)
+			LDA.l ArrowMode : BEQ ++
-			BRA .done
+			LDA.l BowEquipment : BEQ +++
+			++ %SetMinimum(CurrentArrows,ArrowsFiller,RainDeathRefillArrows_Uncle)
+			+++ BRA .done
 		+ CMP.b #$02 : BNE + ; Cell
 			%SetMinimum(CurrentMagic,MagicFiller,RainDeathRefillMagic_Cell)
 			%SetMinimum(BombsEquipment,BombsFiller,RainDeathRefillBombs_Cell)
-			%SetMinimum(CurrentArrows,ArrowsFiller,RainDeathRefillArrows_Cell)
+			LDA.l ArrowMode : BEQ ++
+			LDA.l BowEquipment : BEQ .done
+			++ %SetMinimum(CurrentArrows,ArrowsFiller,RainDeathRefillArrows_Cell)
 			BRA .done
 		+ CMP.b #$04 : BNE + ; Mantle
 			%SetMinimum(CurrentMagic,MagicFiller,RainDeathRefillMagic_Mantle)
 			%SetMinimum(BombsEquipment,BombsFiller,RainDeathRefillBombs_Mantle)
-			%SetMinimum(CurrentArrows,ArrowsFiller,RainDeathRefillArrows_Mantle)
+			LDA.l ArrowMode : BEQ ++
+			LDA.l BowEquipment : BEQ .done
+			++ %SetMinimum(CurrentArrows,ArrowsFiller,RainDeathRefillArrows_Mantle)
 		+
 	.done
 RTL

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
+org $82FD00 ; unreachable code
-Underworld_DoorDown_Call:
+Underworld_SetBossOrSancMusicUponEntry_long:
-org $82C3F3
+JSR Underworld_SetBossOrSancMusicUponEntry : RTL
-dw $8AD9 ; address of Bank02.asm:2085
 
 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
 }
 

keydrop/standing_items.asm

@@ -9,6 +9,10 @@ org $829C25
 org $89C2BB
 	JSL ClearSpriteData
 
+; underworld -> overworld transition
+org $8282D1
+	JSL ClearSpriteData2
+
 org $89C327
 	JSL LoadSpriteData
 
@@ -288,6 +292,8 @@ RTS
 
 ClearSpriteData:
 	STZ.b $03 ; what we overrode  # we no longer need STZ $02 see underworld_sprite_hooks
+	.shared:
+
 	PHX
 		LDA #$00 : LDX #$00
 		.loop
@@ -297,6 +303,10 @@ ClearSpriteData:
 	PLX
 	RTL
 
+ClearSpriteData2:
+	LDA.b #$82 : STA.b $99
+	JMP ClearSpriteData_shared
+
 ; Runs during sprite load of the room
 LoadSpriteData:
 	INY : INY