From d3fd54600f8b5f0c83b2f3f779e5d7db082fa93e Mon Sep 17 00:00:00 2001
From: codemann8 <codemann8@gmail.com>
Date: Sun, 27 Jun 2021 14:50:28 -0500
Subject: [PATCH] Added ability to cancel out of flute menu by pressing X

---
 Rom.py                |   2 +-
 asm/owrando.asm       |  26 ++++++++++++++++++++++++++
 data/base2current.bps | Bin 138498 -> 138574 bytes
 3 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/Rom.py b/Rom.py
index a28828a3..7b2a9074 100644
--- a/Rom.py
+++ b/Rom.py
@@ -27,7 +27,7 @@ from EntranceShuffle import door_addresses, exit_ids
 
 
 JAP10HASH = '03a63945398191337e896e5771f77173'
-RANDOMIZERBASEHASH = '837932c9c668a71707a764494f7a6e1a'
+RANDOMIZERBASEHASH = '5fecbc1016544cfdcc596abffaed6736'
 
 
 class JsonRom(object):
diff --git a/asm/owrando.asm b/asm/owrando.asm
index 60feff3b..f0094b38 100644
--- a/asm/owrando.asm
+++ b/asm/owrando.asm
@@ -12,6 +12,12 @@ dw 0
 org $02a999
 jsl OWEdgeTransition : nop #4 ;LDA $02A4E3,X : ORA $7EF3CA
 
+; flute menu cancel
+org $0ab7af ;LDA $F2 : ORA $F0 : AND #$C0
+jml OWFluteCancel2 : nop
+org $0ab90d ;JSL $02E99D
+jsl OWFluteCancel
+
 ;(replacing -> LDA $8A : AND.b #$40)
 org $00d8c4  ; < ? - Bank00.asm 4068 ()
 jsl.l OWWorldCheck
@@ -84,6 +90,7 @@ DivideByTwoPreserveSign:
 {
     asl : php : ror : plp : ror : rtl
 }
+
 OWWorldCheck:
 {
     phx
@@ -97,6 +104,25 @@ OWWorldCheck16:
     plx : and.w #$00ff : rtl
 }
 
+OWFluteCancel:
+{
+    lda.l OWFlags+1 : and #$10 : bne +
+        jsl $02e99d : rtl
+    + lda $7f5006 : cmp #$01 : beq +
+        jsl $02e99d
+    + lda #$00 : sta $7f5006 : rtl
+}
+OWFluteCancel2:
+{
+    lda $f2 : ora $f0 : and #$c0 : bne +
+        jml $0ab7bd
+    + inc $0200
+    lda.l OWFlags+1 : and #$10 : beq +
+    lda $f2 : cmp #$40 : bne +
+        lda #$01 : sta $7f5006
+    + rtl 
+}
+
 org $aa9000
 OWEdgeTransition:
 {
diff --git a/data/base2current.bps b/data/base2current.bps
index 380df4070b2fcdd31c960f1659941eb29b66e980..61633070c0913a09a35193006e437b49355a2929 100644
GIT binary patch
delta 223
zcmV<503iQ@x(Lp?2(UZ>1T65=53@i4+6o|WfRS8fh^p#9h@B#1n4ltY$E21WN1E#u
zR+5QDh^kz(E)22qNCkiZYp(@>swoiA1tOj40&A}ZP=Cn*@B|{A=>n+$j|NbGYnDI=
zh@sE~T)npn?f?RpY-ft4@C>E$$w1HssR5I!Te@96iIeL78v{8vpR)-6n>s*~M@m6}
ztq1@A_x|_(_x$(#_m($-ssAtkFaPg9uYa$9j+ByrWw)*iMv;O4mLht%lVkzFk~AZM
Zh5!GvbVvWU;5h*r;|K!K4Sg+v43kvfYMB54

delta 153
zcmV;K0A~Nrx(I^02(UZ>1icJG^Rqw!+6oj%ik%{3n4ltY$E21WN1E#uR+4D5It;P$
zDW3&P0Dx1xNOS>!;Rsr<0)VOy1AwaV1|lMms(=I{8IY=aC~KZ=Eta!U|C>4$l3zNk
ztq1@A_x|_(_x$(#_m&<wtd{{g0TvRET7iK-o57M|9=nDA|Fa7LfVV6<0UF~7*J|Z3
H{h+iv?s-MZ