From 550a8203c3a55ba22b5b177325d25e272a02b703 Mon Sep 17 00:00:00 2001
From: codemann8 <codemann8@gmail.com>
Date: Fri, 15 Apr 2022 10:49:29 -0500
Subject: [PATCH] Changed OW map in attract mode to show LW map always

---
 Rom.py                |   2 +-
 asm/owrando.asm       |  13 +++++++++++--
 data/base2current.bps | Bin 91993 -> 92009 bytes
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/Rom.py b/Rom.py
index d71b9078..8a95becc 100644
--- a/Rom.py
+++ b/Rom.py
@@ -33,7 +33,7 @@ from source.classes.SFX import randomize_sfx
 
 
 JAP10HASH = '03a63945398191337e896e5771f77173'
-RANDOMIZERBASEHASH = 'af1ee009b2a843e091d5d095b428ce1a'
+RANDOMIZERBASEHASH = 'eb83b66abc743105de77b9ceaa4c6d57'
 
 
 class JsonRom(object):
diff --git a/asm/owrando.asm b/asm/owrando.asm
index 00afe10c..c1415483 100644
--- a/asm/owrando.asm
+++ b/asm/owrando.asm
@@ -52,6 +52,10 @@ jsl OWOldManSpeed
 org $0283dc
 jsl.l OWLightWorldOrCrossed
 
+; override world check when viewing overworld (incl. title screen portion)
+org $0aba6c  ; < ? - Bank0a.asm:474 ()
+jsl.l OWMapWorldCheck16 : nop
+
 ;(replacing -> LDA $8A : AND.b #$40)
 org $00d8c4  ; < ? - Bank00.asm:4068 ()
 jsl.l OWWorldCheck
@@ -77,8 +81,6 @@ org $07aa34  ; < ? - Bank07.asm:6718 ()
 jsl.l OWWorldCheck
 org $08d408  ; < ? - ancilla_morph_poof.asm:48 ()
 jsl.l OWWorldCheck
-org $0aba6c  ; < ? - Bank0a.asm:474 ()
-jsl.l OWWorldCheck16 : nop
 org $0aba99  ; < ? - Bank0a.asm:515 ()
 jsl.l OWWorldCheck
 org $0bfeab  ; < ? - Bank0b.asm:36 ()
@@ -135,6 +137,13 @@ OWWorldCheck16:
         ldx $8a : lda.l OWTileWorldAssoc,x
     plx : and.w #$00ff : rtl
 }
+OWMapWorldCheck16:
+{
+    lda $10 : cmp #$0014 : beq .return ; attract module, return with Z flag cleared
+        jsl OWWorldCheck16
+    .return
+    rtl
+}
 
 OWWhirlpoolUpdate:
 {
diff --git a/data/base2current.bps b/data/base2current.bps
index 3fc229ebabfe8ba7c0c246e23b77fc6636469426..287ab5125322c4337a4c636b495478d1a8c8dc92 100644
GIT binary patch
delta 335
zcmV-V0kHnr&IRet1+YZ{1dpC@VWUX_0RhdkN&=Pv0a26T1K9zile+|%0c*2V1+D@C
zA+rMr$pHb4v&{*O0s%3TTMV!?{fMgSK!}|px0s+JBFUtd9Y>n$6;_go-H57OfR!Q?
zgrtBDw|bN~hmj&hh^p!wfRhWCvpfw{0vD4z290oriSEdxYz~8oegC0sh_eVCowKJ8
ziv|e<Os6o0qi8X@vpW{D@(&$=0BfZX$rJ$a1R^<zs+aEw0UR}EXNrLVmuE(%nFp`R
z^M3FMlYHclaH)x@-bkNlHKn--t<M@sfQ`=@sVrQDsRx_3fgG1vmp};t9|1&{U<m<A
z0YjIo2>~SmJD1T30Yd>Ww-pKjwgMDPDjk5a1*QcchLfcQg^I#3V2@pw-wXj65`KVz
hfT!n;IE^m>k|nZ%EtgBT3Jn2AS_l>biLFmqEWn%_gggKM

delta 319
zcmV-F0l@z0&IQ@d1+YZ{1cjq|T%$<=0Rh3YN&=Pv0Y#JH1K9zWle+|%0bjFJ1+D@C
z6|(~f$pHa@v&{*O0s$qHTMV!<@rbJGK!}|px0s+JBFUtd9Y>n$6;_go(TJ*CfR!Q?
zgrtBDw|bN~hm&K39DtKEk+VMyR00>93MP?ghKcUTq-+j@iGBZ}Y>2Z#4}r6)4~qr~
z3^tuGhNECd#IrsYvho7$0GIy=0UR|>XNrLVmrq8fnFp`R^M3FMlYHclaH)x@-bkNN
zHKn--t<M@sfQ`=@sVrQDsRx_3fgG1Xmrw}-9|0_va0vlQ0V|ig2>~SmYnR~(0Yd>8
zw<QVzwgMD1Djk5a1*QcchLfcQg^I#3V2?$Y?+gJM5@vvbfT!n;IE^m>k|nZ%EtfO5
R8VvzQS_pvDW=3=5`u!!ufI0vG