From 71e6d54276f47b4e6ea3f17a172c99fed3ee407d Mon Sep 17 00:00:00 2001 From: cassidoxa Date: Thu, 31 Aug 2023 15:17:07 -0400 Subject: [PATCH] Fix for item receipt after GT boss heart container collected --- dungeondrops.asm | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/dungeondrops.asm b/dungeondrops.asm index 6abf178..a3aa120 100644 --- a/dungeondrops.asm +++ b/dungeondrops.asm @@ -107,10 +107,11 @@ SetCutsceneFlag: CLC RTL .dungeon_prize - LDA.w ItemReceiptID : TAX - LDA.l InventoryTable_properties,X : BPL .no_cutscene - PLX - SEC + JSR.w PrizeAncillaCheck : BCC .no_cutscene + LDA.w ItemReceiptID : TAX + LDA.l InventoryTable_properties,X : BPL .no_cutscene + PLX + SEC RTL AnimatePrizeCutscene: @@ -324,3 +325,15 @@ CheckDungeonWorld: .dark_world SEP #$02 RTL + +PrizeAncillaCheck: + PHX + LDX.w CurrentSpriteSlot + LDA.w AncillaVelocityZ,X : BNE .prize ; Only prizes should have Z velocity after + PLX ; room boss heart container is collected + CLC + RTS + .prize + PLX + SEC +RTS