From 12e30ba2db80be43adcb37ef375f671e0f27b87b Mon Sep 17 00:00:00 2001
From: cassidy <cassidymoen@gmx.com>
Date: Sat, 8 May 2021 22:59:09 -0400
Subject: [PATCH] Remove flashing ancilla near pedestal item during cutscene

---
 accessibility.asm | 15 ++++++++++++++-
 hooks.asm         |  3 +++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/accessibility.asm b/accessibility.asm
index ee2095f..4ce614b 100644
--- a/accessibility.asm
+++ b/accessibility.asm
@@ -1,5 +1,5 @@
 ;================================================================================
-; Accessability Fixes
+; Accessibility Fixes
 ;================================================================================
 FlipGreenPendant:
 	LDA $0C : CMP #$38 : BNE + ; check if we have green pendant
@@ -226,3 +226,16 @@ ConditionalRedFlash:
             LDA.w #$0000
 
 RTL
+;================================================================================
+ConditionalPedAncilla:
+        LDA.l DisableFlashing
+        REP #$20 : BNE +
+            LDA $00,X
+            LDA $00 : STA $04
+            LDA $02 : STA $06
+            RTL
+        +
+            LDA $00
+            LDA $00 : LDA $04
+            LDA $02 : LDA $06
+RTL
diff --git a/hooks.asm b/hooks.asm
index 83737d6..b6e0a21 100755
--- a/hooks.asm
+++ b/hooks.asm
@@ -762,6 +762,9 @@ JSL.l ConditionalGTFlash : BRA + : NOP #11 : +
 ;--------------------------------------------------------------------------------
 org $0AFF48 ; <- 57F48 - Bank0A.asm : 4935 (REP #$20 : LDA $7EC3DA)
 JSL.l ConditionalRedFlash : BRA + : NOP #13 : +
+;--------------------------------------------------------------------------------
+org $08C2A1 ; <- 442A3 - ancilla_sword_ceremony.asm : 54 (REP #$20)
+JSL.l ConditionalPedAncilla : BRA + : NOP #4 : +
 ;================================================================================
 ; Ice Floor Toggle
 ;--------------------------------------------------------------------------------