Merge branch 'DRUnstable' into Enemizer

# Conflicts: # keydrop/standing_items.asm
2023-04-05 16:03:17 -06:00
parent 67f22ab602 bd2432d2ce
commit 4f09d30fe5
6 changed files with 32 additions and 9 deletions
--- a/keydrop/standing_items.asm
+++ b/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