From 032c3d20d50fa4399b7f3bf2cb793f8fc0be76a0 Mon Sep 17 00:00:00 2001
From: Catobat <69204835+Catobat@users.noreply.github.com>
Date: Mon, 26 Apr 2021 21:52:45 +0200
Subject: [PATCH 1/2] Fix transitions for real

---
 Rom.py                |   2 +-
 asm/owrando.asm       |  14 +++++++++-----
 data/base2current.bps | Bin 136762 -> 136752 bytes
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/Rom.py b/Rom.py
index bb989a39..00572619 100644
--- a/Rom.py
+++ b/Rom.py
@@ -27,7 +27,7 @@ from EntranceShuffle import door_addresses, exit_ids
 
 
 JAP10HASH = '03a63945398191337e896e5771f77173'
-RANDOMIZERBASEHASH = 'fe3da939a159ce3e7ff37442d265b94f'
+RANDOMIZERBASEHASH = 'e78243509664e63d4cd02047c80db209'
 
 
 class JsonRom(object):
diff --git a/asm/owrando.asm b/asm/owrando.asm
index 7b88a30a..a56edf06 100644
--- a/asm/owrando.asm
+++ b/asm/owrando.asm
@@ -87,11 +87,12 @@ OWShuffle:
     
     inx : lda.l OWEdgeOffsets,x ;record id of first transition in table
     ;multiply ^ by 26, 26bytes per record
-    stz $211c ;ensure the next write to $211b counts as the first write
-    sta $211b : stz $211b : lda #26 : sta $211c : pla ;a = number of trans
-    ldx $2134 ;x = offset to first record
+    sta $4202 : lda #26 : sta $4203
+    ;do something else for 8 cycles before getting the result
+    pla ;a = number of trans
     rep #$20
     and #$00ff
+    ldx $4216 ;x = offset to first record
 
     .nextTransition
     pha
@@ -159,8 +160,11 @@ OWSearchTransition:
 }
 OWNewDestination:
 {
-    tya : sta $211b : stz $211b : lda #26 : sta $211c : rep #$20 : lda $2134
-    phx : !add 1,s : plx : !add #$0006 : tax ;a = offset to dest record
+    tya : sta $4202 : lda #26 : sta $4203
+    ;do something else for 8 cycles before getting the result
+    rep #$20
+    txa : !add #$0006
+    adc $4216 : tax ;a = offset to dest record
     lda.w $0000,x : sta $06 ; set coord
     inx #2 : lda.w $0000,x : sta $04 ;save dest OW slot/ID
     ;I thought I'd need some of these values below, but I likely dont need any of them
diff --git a/data/base2current.bps b/data/base2current.bps
index a39fb41abfc565fac5ee8a8e21ff709db8d50e71..094bb81b18d3644ab5afb238de3d2d79784999df 100644
GIT binary patch
delta 213
zcmV;`04o2wtO&5I2(T{!1Xz}*X|po{x%V!0f(l~+sty1LXyPEh0I;el|L`kF=)VB4
zs*M6dsTz#~LTJJuDgOYj7D7lM$CDuWM<t@6tAH^&&@#WYzMDv5i-9GN&W*()kR6-F
zi^iYF$=ad-xFDjFjQL730WTwfg*af6KWl)Esu*CHpExZefR0cEfW>JB0BsgRs=WXJ
zg$C&8y#N4(k`c?FdqtBB`ZobOlSKMN0UMKv`YZuVleYRj0XdWO`X~c;<W_?p`?nwa
P0TUYtq1fA+lEr7xN}62-

delta 205
zcmV;;05boutO&ZS2(T{!1j~^$ZnHB1x%V^;g9>8-sty1LXyPEh0I;el|L`$L=)VB4
zs+=4ljT<4H8zHG0jT|9pt~4RSASwR<NFdFV8u>>JsG+NXF*?vPzqG!aRFiJ`7Xhe~
zhWSc14KE{rg*af6KWl)Esu*CHt3E9wfaSs<tu!Ip7-IqY7-<Fos=WXJg$C&8y#N4(
zl1R9p2S$?u`ZobolRElD0X36<`YZuvldSqZ0aKIe`X~cK<Zy!(`?nSQ0TUYtM`VJ6
H1>)zxsGC&q


From 8cc1b20d188e19f58ea570564fef040911c5d321 Mon Sep 17 00:00:00 2001
From: Catobat <69204835+Catobat@users.noreply.github.com>
Date: Mon, 26 Apr 2021 21:54:52 +0200
Subject: [PATCH 2/2] Change defaults

---
 CLI.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CLI.py b/CLI.py
index cc78b7b3..3a7b4967 100644
--- a/CLI.py
+++ b/CLI.py
@@ -142,7 +142,7 @@ def parse_settings():
         # Shuffle Ganon defaults to TRUE
         "openpyramid": False,
         "shuffleganon": True,
-        "ow_shuffle": "vanilla",
+        "ow_shuffle": "full",
         "shuffle": "vanilla",
 
         "shufflepots": False,
@@ -159,8 +159,8 @@ def parse_settings():
         "keyshuffle": False,
         "bigkeyshuffle": False,
         "keysanity": False,
-        "door_shuffle": "basic",
-        "intensity": 2,
+        "door_shuffle": "none",
+        "intensity": 3,
         "experimental": False,
         "dungeon_counters": "default",
         "mixed_travel": "prevent",