Skip ResetOcarinaFlag in state 00,01

2024-03-11 20:46:23 -04:00
parent d906beadd7
commit 3ec96b6b64
1 changed files with 4 additions and 2 deletions
--- 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
 }