Don't delete follower on crystal cutscene if prize shuffle

2024-08-27 07:15:18 -05:00
parent 8b827c3745
commit b3979affc9
3 changed files with 16 additions and 0 deletions
--- a/dungeondrops.asm
+++ b/dungeondrops.asm
@@ -450,3 +450,15 @@ ClearMultiworldText:
                +
        PLX : PLP
 RTL 
+
+MaybeSkipCrystalCutsceneFollowerReset:
+PHA
+        ; skip if prizes are shuffled outside of normal boss drops
+        LDA.l InventoryTable_properties+($37*2) : AND.b #$01 : BEQ .continue
+.skip
+PLA : PLA : PLA : PLA
+JML CrystalCutscene_SpawnMaiden_PostFollowerGfx
+.continue
+PLA
+STA.l FollowerIndicator ; what we wrote over
+RTL