From e31af840cc76b28076dec1f845009f0d7eb26bac Mon Sep 17 00:00:00 2001 From: codemann8 Date: Fri, 16 Jul 2021 12:51:44 -0500 Subject: [PATCH] Added minor commented data as prep --- OWEdges.py | 18 ++++++++++++++++++ OverworldShuffle.py | 5 ++++- asm/owrando.asm | 2 +- 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/OWEdges.py b/OWEdges.py index 04ba3e69..3d3a4bd9 100644 --- a/OWEdges.py +++ b/OWEdges.py @@ -437,6 +437,16 @@ OWEdgeGroups = { ['Octoballoon NE'] ] ), + # (Op, LW, Vt, Ld, NP, 1): ( + # [ + # ['Master Sword Meadow SC'], + # ['Zoras Domain SW'] + # ], + # [ + # ['Lost Woods NW'], + # ['Zora Waterfall NE'] + # ] + # ), (Op, LW, Hz, Ld, PL, 2): ( [ ['Kakariko Fortune EN', 'Kakariko Fortune ES'], @@ -493,6 +503,14 @@ OWEdgeGroups = { ['Statues WC'] ] ), + # (Op, LW, Hz, Wr, NP, 1): ( + # [ + # ['Hobo EC'] + # ], + # [ + # ['Stone Bridge WC'] + # ] + # ), (Op, LW, Vt, Wr, PL, 1): ( [ ['Tree Line SC'], diff --git a/OverworldShuffle.py b/OverworldShuffle.py index 71641fbe..6c87cc04 100644 --- a/OverworldShuffle.py +++ b/OverworldShuffle.py @@ -1092,12 +1092,14 @@ parallelsimilar_connections = [('Maze Race ES', 'Kakariko Suburb WS'), ] # non shuffled overworld -default_connections = [('Lost Woods SW', 'Lost Woods Pass NW'), +default_connections = [#('Lost Woods NW', 'Master Sword Meadow SC'), + ('Lost Woods SW', 'Lost Woods Pass NW'), ('Lost Woods SC', 'Lost Woods Pass NE'), ('Lost Woods SE', 'Kakariko Fortune NE'), ('Lost Woods EN', 'Lumberjack WN'), ('Lumberjack SW', 'Mountain Entry NW'), ('Mountain Entry SE', 'Kakariko Pond NE'), + #('Zora Waterfall NE', 'Zoras Domain SW'), ('Lost Woods Pass SW', 'Kakariko NW'), ('Lost Woods Pass SE', 'Kakariko NC'), ('Kakariko Fortune SC', 'Kakariko NE'), @@ -1146,6 +1148,7 @@ default_connections = [('Lost Woods SW', 'Lost Woods Pass NW'), ('Stone Bridge SC', 'Lake Hylia NW'), ('Stone Bridge EN', 'Tree Line WN'), ('Stone Bridge EC', 'Tree Line WC'), + #('Stone Bridge WC', 'Hobo EC'), ('Tree Line SC', 'Lake Hylia NC'), ('Tree Line SE', 'Lake Hylia NE'), ('Desert EC', 'Desert Pass WC'), diff --git a/asm/owrando.asm b/asm/owrando.asm index 8cd7bcf1..e0d986f5 100644 --- a/asm/owrando.asm +++ b/asm/owrando.asm @@ -353,7 +353,7 @@ OWNewDestination: ; turn into bunny lda $5d : cmp #$17 : beq .return lda #$17 : sta $5d - lda #$01 : sta $2e0 + lda #$01 : sta $02e0 bra .return .nobunny lda $5d : cmp #$17 : bne .return