Fix for post-mirror follower sprite gfx

2025-11-22 06:52:45 -06:00
parent 00fb9e6c5d
commit 2418c1b322
2 changed files with 15 additions and 3 deletions
--- 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
+	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
--- 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