From b22d6183235e6bd45c34bafeef338f6040ca8773 Mon Sep 17 00:00:00 2001
From: codemann8 <codemann8@gmail.com>
Date: Sat, 13 Apr 2024 03:18:26 -0500
Subject: [PATCH] Fixed issue with Flute Cancel in OW Layout Shuffle

---
 owrando.asm | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/owrando.asm b/owrando.asm
index c67f6c2..1e91896 100644
--- a/owrando.asm
+++ b/owrando.asm
@@ -43,6 +43,9 @@ Overworld_LoadSpecialOverworld_RoomId:
 org $84E8B4
 Overworld_LoadSpecialOverworld:
 
+org $84E96A
+JSL OWSpecialReturnTriggerClear
+
 org $82A9DA
 JSL OWSkipPalettes
 BCC OverworldHandleTransitions_change_palettes : NOP #4
@@ -758,8 +761,8 @@ OWDetectSpecialTransition:
 OWEdgeTransition:
 {
     LDA.l OWMode : ORA.l OWMode+1 : BEQ .unshuffled
-    LDY.w RandoOverworldTargetEdge : CPY.b #$7F
-    BEQ .unshuffled
+    LDY.w RandoOverworldTargetEdge : STZ.w RandoOverworldTargetEdge
+    CPY.b #$7F : BEQ .unshuffled
         REP #$10
         LDX.w RandoOverworldEdgeAddr
         PHB : PHK : PLB
@@ -1199,6 +1202,12 @@ OWEndScrollTransition:
     CMP.l Overworld_FinalizeEntryOntoScreen_Data,X ; what we wrote over
     RTL
 }
+OWSpecialReturnTriggerClear:
+{
+    STZ.b SubSubModule : STZ.b RoomIndex ; what we wrote over
+    STZ.w RandoOverworldTargetEdge
+    RTL
+}
 
 ;Data
 org $aaa000