From f389a2e737dc0acad31538346ed7ae4e73c62c14 Mon Sep 17 00:00:00 2001
From: cassidy <cassidymoen@gmx.com>
Date: Sun, 9 May 2021 02:17:09 -0400
Subject: [PATCH] DisableFlashing now disables electro palette changing Affects
 Ether animation and enemies that electrocute Link

---
 accessibility.asm | 34 +++++++++++++++++++++++++++++-----
 hooks.asm         |  9 +++++++++
 2 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/accessibility.asm b/accessibility.asm
index 4ce614b..2a2efad 100644
--- a/accessibility.asm
+++ b/accessibility.asm
@@ -20,7 +20,6 @@ ConditionalLightning:
         ++
                 LDA.b #$72
         STA $9A
-
 RTL
 ;================================================================================
 ConditionalWhitenBg:
@@ -34,7 +33,6 @@ ConditionalWhitenBg:
             LDA $00
             JSR WhitenLoopDummy
             RTL
-
 ;================================================================================
 WhitenLoopReal:
         -
@@ -168,7 +166,6 @@ RestoreBgEther:
             BRA ++
         ++
             JML $02FF51 
-
 ;================================================================================
 DDMConditionalLightning:
         LDA.l DisableFlashing 
@@ -190,7 +187,6 @@ DDMConditionalLightning:
 
                 LDX.b #$02
                 JML $07FAAC
-
 ;================================================================================
 ConditionalGTFlash:
         LDA.l DisableFlashing
@@ -224,7 +220,6 @@ ConditionalRedFlash:
             LDA.w #$1D59 : LDA $7EC5DA
             LDA.w #$25FF : LDA $7EC5DC
             LDA.w #$0000
-
 RTL
 ;================================================================================
 ConditionalPedAncilla:
@@ -239,3 +234,32 @@ ConditionalPedAncilla:
             LDA $00 : LDA $04
             LDA $02 : LDA $06
 RTL
+;================================================================================
+ConditionalChangeGearPalette:
+    PHY
+    STA $00
+    SEP #$20
+    LDA.l DisableFlashing : REP #$20 : BNE +
+    LDA $00,X
+    -
+        LDA [$00] : STA $7EC300, X : STA $7EC500, X
+        INC $00 : INC $00
+        INX #2
+        DEY : BPL -
+        BRA ++
+    +
+    LDA $00
+    -
+        LDA [$00] : LDA $7EC300, X : LDA $7EC500, X
+        INC $00 : INC $00
+        INX #2
+        DEY : BPL -
+        BRA ++
+    ++
+    PLY ; use what was in Y register to determine which p flags to set
+    CPY #$000E : BEQ + 
+        SEP #$10
+        RTL
+    +
+        SEP #$30
+RTL
diff --git a/hooks.asm b/hooks.asm
index b6e0a21..e0884e2 100755
--- a/hooks.asm
+++ b/hooks.asm
@@ -765,6 +765,15 @@ JSL.l ConditionalRedFlash : BRA + : NOP #13 : +
 ;--------------------------------------------------------------------------------
 org $08C2A1 ; <- 442A3 - ancilla_sword_ceremony.asm : 54 (REP #$20)
 JSL.l ConditionalPedAncilla : BRA + : NOP #4 : +
+;--------------------------------------------------------------------------------
+org $02FDB1 ; <- 17DB1 - Bank0E.asm : 3760 (JSL LoadGearPalette)
+JSL.l ConditionalChangeGearPalette : NOP
+;--------------------------------------------------------------------------------
+org $02FDCB ; <- 17DCB - Bank0E.asm : 3775 (JSL LoadGearPalette)
+JSL.l ConditionalChangeGearPalette : NOP
+;--------------------------------------------------------------------------------
+org $02FDE6 ; <- 17DE6 - Bank0E.asm : 3789 (JSL LoadGearPalette)
+JSL.l ConditionalChangeGearPalette : NOP
 ;================================================================================
 ; Ice Floor Toggle
 ;--------------------------------------------------------------------------------