From c643fb8a9164a678cd04263bde155a2140248260 Mon Sep 17 00:00:00 2001
From: scawful <justin.scofield@outlook.com>
Date: Tue, 18 Jun 2024 17:34:20 -0400
Subject: [PATCH] remove book activation for zora waterfall overlay event

---
 Overworld/overlays.asm | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/Overworld/overlays.asm b/Overworld/overlays.asm
index bd61c9b..c4f8e83 100644
--- a/Overworld/overlays.asm
+++ b/Overworld/overlays.asm
@@ -63,8 +63,15 @@ org $07866D
 ; SEP #$20
 
 ; ================================================
+; Overlays $04C6
+; 01 - Zora Temple (OW 1E)
+; 02 - Kalyxo Castle Bridge
+; 03 - Tail Palace
+; 04 - TODO: Shrines
+; 05 - TODO: Fortress of Secrets
 
-;Desert Book activation trigger
+; LinkItem_Book
+; Desert Book activation trigger
 org $07A484 ; LDA $02ED : BNE BRANCH_BETA
 NOP #01
 JML NewDesertCheck
@@ -81,20 +88,10 @@ NewDesertCheck:
   ; STZ $9A
   ; STZ.w $012D
 
-  LDA $8A : CMP.b #$1E : BEQ .zora
-            CMP.b #$1B : BEQ .castle
-            CMP.b #$2F : BEQ .tail_palace
-            JMP + ; returnPos
-  .tail_palace
-  LDA.b #$03 : STA.w $04C6
-  JMP .continue
+  LDA $8A : CMP.b #$1B : BEQ .castle
+    JMP +
   .castle
   LDA.b #$02 : STA.w $04C6
-  JMP .continue
-  .zora
-  LDA.b #$01 : STA.w $04C6 ; set entrance animation
-
-  .continue
   STZ.b $B0
   STZ.b $C8