From 2418c1b3226964e704e72a4c4ca9d65f17356747 Mon Sep 17 00:00:00 2001
From: codemann8 <codemann8@gmail.com>
Date: Sat, 22 Nov 2025 06:52:45 -0600
Subject: [PATCH] Fix for post-mirror follower sprite gfx

---
 bugfixes.asm | 14 ++++++++++++--
 hooks.asm    |  4 +++-
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/bugfixes.asm b/bugfixes.asm
index 7a6d59a..e9cb94e 100644
--- a/bugfixes.asm
+++ b/bugfixes.asm
@@ -180,9 +180,19 @@ LDA.b IndoorsFlag : BNE +
 +
 RTL
 
+PostFixMirrorGfxPrep:
+	LDA.b #$01 : STA.w OWTransitionFlag
+	JML HandleFollowersAfterMirroring ; what we wrote over
+
+; warning, this is called on frames after PostFixMirrorGfxPrep but for
+; several frames after, so we use OWTransitionFlag to run something once
 PostFixMirrorGfx:
-	JSL HandleFollowersAfterMirroring
-	JML FollowerGfxRedraw
+	STA.w SubModuleInterface ; what we wrote over
+	LDA.w OWTransitionFlag : CMP.b #$01 : BNE .done
+		LDA.b #$08 : STA.w OWTransitionFlag
+		JML FollowerGfxRedraw
+.done
+	RTL
 
 PostFixOAMGfx:
 	JSL FollowerGfxRedraw
diff --git a/hooks.asm b/hooks.asm
index 253b607..ce4ffd7 100755
--- a/hooks.asm
+++ b/hooks.asm
@@ -411,7 +411,9 @@ JSL OnLoadDuckMap
 ; Fix Clobbered Gfx
 ;--------------------------------------------------------------------------------
 org $80DB92
-JSL PostFixMirrorGfx
+JSL PostFixMirrorGfxPrep
+org $80D911
+JML PostFixMirrorGfx
 org $80E259
 JSL PostFixOAMGfx : NOP