Merge remote-tracking branch 'upstream/master' into DRUnstable

This commit is contained in:
aerinon
2024-06-18 11:50:26 -06:00
26 changed files with 443 additions and 262 deletions

View File

@@ -3,6 +3,11 @@
;--------------------------------------------------------------------------------
SpawnDungeonPrize:
PHX : PHB
TAX
LDA.b $06,S : STA.b ScrapBuffer72 ; Store current RoomTag index
TXA
JSL.l AttemptItemSubstitution
JSL.l ResolveLootIDLong
JSL AttemptItemSubstitution
JSL ResolveLootIDLong
STA.w ItemReceiptID
@@ -14,6 +19,7 @@ SpawnDungeonPrize:
LDA.w ItemReceiptID
STA.w AncillaGet,X : STA.w SpriteID,X
JSR AddDungeonPrizeAncilla
LDX.b ScrapBuffer72 : STZ.b RoomTag,X
.failed_spawn
PLB : PLX
RTL