Merge branch 'DRUnstable' into OWMain

2023-03-14 17:18:06 -05:00
parent 11e815bd96 69a6e7f918
commit 726b9441b7
3 changed files with 24 additions and 4 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

@@ -303,6 +307,7 @@ RTS

 ClearSpriteData:
 	STZ.b $02 : STZ.b $03 ; what we overrode
+ClearSpriteData_Shared:
 	PHX
 		LDA #$00 : LDX #$00
 		.loop
@@ -312,6 +317,10 @@ ClearSpriteData:
 	PLX
 	RTL

+ClearSpriteData2:
+	LDA.b #$82 : STA.b $99
+	JMP ClearSpriteData_Shared
+
 ; Runs during sprite load of the room
 LoadSpriteData:
 	INY : INY