From 3ec96b6b6451c1e96ba2364b1bd3f4ef1fb1b2d4 Mon Sep 17 00:00:00 2001
From: scawful <justin.scofield@outlook.com>
Date: Mon, 11 Mar 2024 20:46:23 -0400
Subject: [PATCH] Skip ResetOcarinaFlag in state 00,01

---
 Items/ocarina.asm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Items/ocarina.asm b/Items/ocarina.asm
index 7e73e3c..d7b20dc 100644
--- a/Items/ocarina.asm
+++ b/Items/ocarina.asm
@@ -300,15 +300,17 @@ CheckRealTable:
 
 ResetOcarinaFlag:
 {
+  LDA $7EF3C5 : BEQ .continue
+     CMP #$01 : BEQ .continue
   REP #$30
   LDA #$0000 : STA.l  $7EE00E
   SEP #$30
-
+.continue
   LDA.w $0416 : ASL A 
   RTL
 }
 
-org $02F210
+org $02F210 ; OverworldTransitionScrollAndLoadMap
 {
   JSL ResetOcarinaFlag
 }