From 247128b9f6a48ac19f929e9097aa94344b45b980 Mon Sep 17 00:00:00 2001
From: cassidoxa <cassidymoen@gmx.com>
Date: Wed, 23 Aug 2023 13:24:46 -0400
Subject: [PATCH] Move setting DungeonsCompleted bitfield to post-boss/prize
 transition

---
 dungeondrops.asm | 9 ---------
 events.asm       | 5 +++++
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/dungeondrops.asm b/dungeondrops.asm
index b425ab8..6a364e8 100644
--- a/dungeondrops.asm
+++ b/dungeondrops.asm
@@ -103,7 +103,6 @@ SetCutsceneFlag:
                 CLC
                 RTL
         .dungeon_prize
-        JSR.w SetDungeonCompletion
         LDA.w ItemReceiptID : TAX
         LDA.l InventoryTable_properties,X : BPL .no_cutscene
                 PLX
@@ -172,14 +171,6 @@ CheckSpawnPrize:
         SEP #$21
 RTL
 
-SetDungeonCompletion:
-        LDX.w DungeonID : BMI +
-                REP #$20
-                LDA.l DungeonItemMasks, X : ORA.l DungeonsCompleted : STA.l DungeonsCompleted
-                SEP #$20
-        +
-RTS
-
 CheckDungeonCompletion:
         LDX.w DungeonID
         REP #$20
diff --git a/events.asm b/events.asm
index 89ce961..2978ea7 100644
--- a/events.asm
+++ b/events.asm
@@ -27,6 +27,11 @@ RTL
 ;--------------------------------------------------------------------------------
 OnDungeonBossExit:
         JSL.l StatTransitionCounter
+        LDX.w DungeonID : BMI +
+                REP #$20
+                LDA.l DungeonItemMasks, X : ORA.l DungeonsCompleted : STA.l DungeonsCompleted
+                SEP #$20
+        +
 RTL
 ;--------------------------------------------------------------------------------
 OnPlayerDead: