From 36a75b7c9922d90221c3f4a5c0c6078f56a97903 Mon Sep 17 00:00:00 2001
From: codemann8 <codemann8@gmail.com>
Date: Sun, 7 Nov 2021 16:25:23 -0600
Subject: [PATCH] Allow normal Link speed with Old Man if not in his cave or on
 WDM

---
 Rom.py                |   2 +-
 asm/owrando.asm       |  20 ++++++++++++++++++++
 data/base2current.bps | Bin 141292 -> 141326 bytes
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/Rom.py b/Rom.py
index f4dd88af..05d20cdd 100644
--- a/Rom.py
+++ b/Rom.py
@@ -33,7 +33,7 @@ from source.classes.SFX import randomize_sfx
 
 
 JAP10HASH = '03a63945398191337e896e5771f77173'
-RANDOMIZERBASEHASH = 'e3373be98af9d6de1cb1ab12176ecb0e'
+RANDOMIZERBASEHASH = '9df10796c8a8fe07d81fc0012700934a'
 
 
 class JsonRom(object):
diff --git a/asm/owrando.asm b/asm/owrando.asm
index 283c358f..f244cb79 100644
--- a/asm/owrando.asm
+++ b/asm/owrando.asm
@@ -37,6 +37,10 @@ db #$b0 ; BCS to replace BEQ
 org $06907f ; < 3107f - sprite_prep.asm:2170 (LDA $7EF3CA)
 lda $8a : and.b #$40
 
+; override Link speed with Old Man following
+org $09a32e ; < bank_09.asm:7457 (LDA.b #$0C : STA.b $5E)
+jsl OWOldManSpeed
+
 ; Dark Bonk Rocks Rain Sequence Guards (allowing Tile Swap on Dark Bonk Rocks)
 ;org $09c957 ; <- 4c957
 ;dw #$cb5f ; matches value on Central Bonk Rocks screen
@@ -162,6 +166,22 @@ OWSmithAccept:
         clc : rtl
     + sec : rtl
 }
+OWOldManSpeed:
+{
+    lda $1b : beq .outdoors
+        lda $a0 : and #$fe : cmp #$f0 : beq .vanilla ; if in cave where you find Old Man
+        bra .normalspeed
+    .outdoors
+        lda $8a : cmp #$03 : beq .vanilla ; if on WDM screen
+
+    .normalspeed
+    lda $5e : cmp #$0c : rtl
+        stz $5e : rtl
+
+    .vanilla
+    lda #$0c : sta $5e ; what we wrote over
+    rtl
+}
 
 org $aa9000
 OWEdgeTransition:
diff --git a/data/base2current.bps b/data/base2current.bps
index be48a7a27ce7c08c10dbc3ac6211e0f580d09da1..a73808cb31a95e88023255877f8b0605f6da30ed 100644
GIT binary patch
delta 257
zcmV+c0sj8%&j^mt2(U>31SizkE3-`j+zJU4wv8gQh^kzRlQ9e(lRpdwvrY^@IS7_M
zPm7j%1=W+4MMDBwg0tI2mQoI@6J_R+H~=UR?z0v*oRfZ-8v_+iinE-Upb`<5ejK2k
z=px>Yr10}#mu41>lTE8d13X*Ovz4n6SS6Mh3W@db3Z<Ya{>kw05P$}yipc};2&G=h
z3~OXwYpD!{UNg9ttOEfa11~I<m(2qKAp#~=x9|f23j+lg;2?U5w*&_P;7|yoXCuz4
zmob2s>{kIU0&eBE9asUyP6Vr644;?grU8EhC@BMgmuRN}F#}p;gtwfh0Z4!d<EA$o
Hj|*4RzY}Kl

delta 273
zcmV+s0q*{e&<O0$2(U>31RvetBC|~a+zJ8&!;?V_6q8R329r+=2D4HOLOBSRVM5xL
zL{{OGoJB(eE=Jn3;YF5GE2=dLpO0mof$p;l4#~GLPRWmbr-cIir$C#R0jH+`r<K<T
z6$l&vmI^zQv!j@x5)qdZ7TulbBHoRp@bh4oY%S`ORI5b;MtSqIoU0L7Cy5wqI5)XE
zaDm|nTCW0tst*Hzs_+IPB9N+p1R@!bs(L7Eo;f$4m-7PwAp&Gow-y8e3j+zGB}(*j
z-$X_Kw<ZSx;7|z1aW%3zfdBuO4p;#$0~-dKw?0?_#ZCmOb7#z#2d4pl17aKFmx`wW
XF#|SD(zm{+0Z4!djaNB!;>{OrWS?##