From 642c0c2a101ddfeb7c40275509d648128509550f Mon Sep 17 00:00:00 2001 From: codemann8 Date: Mon, 19 Apr 2021 19:23:43 -0500 Subject: [PATCH] Fixed incorrect data --- OverworldShuffle.py | 7 +++++++ Rom.py | 2 +- asm/owrando.asm | 14 +++++++------- data/base2current.bps | Bin 136763 -> 136746 bytes data/base2current.json | 2 +- 5 files changed, 16 insertions(+), 9 deletions(-) diff --git a/OverworldShuffle.py b/OverworldShuffle.py index 0e63251c..01413363 100644 --- a/OverworldShuffle.py +++ b/OverworldShuffle.py @@ -432,6 +432,13 @@ mandatory_connections = [('Flute Spot 1', 'West Death Mountain (Bottom)'), ('TR Pegs Area Mirror Spot', 'Death Mountain TR Pegs') ] +standard_connections = [('Hyrule Castle SW', 'Central Bonk Rock NW'), + ('Hyrule Castle SE', 'Links House NE'), + ('Central Bonk Rock EN', 'Links House WN'), + ('Central Bonk Rock EC', 'Links House WC'), + ('Central Bonk Rock ES', 'Links House WS') + ] + # non shuffled overworld default_connections = [('Lost Woods SW', 'Lost Woods Pass NW'), ('Lost Woods SC', 'Lost Woods Pass NE'), diff --git a/Rom.py b/Rom.py index feb2460b..401ab8dc 100644 --- a/Rom.py +++ b/Rom.py @@ -27,7 +27,7 @@ from EntranceShuffle import door_addresses, exit_ids JAP10HASH = '03a63945398191337e896e5771f77173' -RANDOMIZERBASEHASH = '28487f9dc4afc4113bfb5e05e435f0fd' +RANDOMIZERBASEHASH = '4989d5437d407c6ef3e13cf6733f5b17' class JsonRom(object): diff --git a/asm/owrando.asm b/asm/owrando.asm index 218ccba9..6fd51aca 100644 --- a/asm/owrando.asm +++ b/asm/owrando.asm @@ -444,7 +444,7 @@ dw $0058, $0058, $0000, $0058, $0008, $0000, $0000, $0000, $0000, $0000, $0000, dw $0178, $0178, $0000, $0178, $0008, $0000, $0000, $0000, $0000, $0000, $0000, $0000, $0004 dw $0388, $0388, $0000, $0388, $0009, $0000, $0000, $0000, $0000, $0000, $0000, $0000, $0005 dw $0480, $05b0, $0130, $0518, $0a0a, $0000, $0000, $0000, $0000, $0000, $0000, $0000, $0006 -dw $0f38, $0f60, $0028, $0f4c, $0f0f, $0000, $0000, $0000, $0000, $0000, $0000, $0000, $0007 +dw $0f70, $0f90, $0020, $0f80, $0f0f, $0000, $0000, $0000, $0000, $0000, $0000, $0000, $0007 dw $0078, $0098, $0020, $0088, $1010, $0000, $0000, $0000, $0000, $0000, $0000, $0000, $0008 dw $0138, $0158, $0020, $0148, $1010, $0000, $0000, $0000, $0000, $0000, $0000, $0000, $0009 dw $02e8, $0348, $0060, $0318, $1111, $0000, $0000, $0000, $0000, $0000, $0000, $0000, $000a @@ -471,7 +471,7 @@ dw $06a0, $07b0, $0110, $0728, $3333, $0000, $0000, $0000, $0000, $0000, $0000, dw $0830, $09b0, $0180, $08f0, $3434, $0000, $0000, $0000, $0000, $0000, $0000, $0000, $001f dw $0e78, $0e88, $0010, $0e80, $3737, $0000, $0000, $0000, $0000, $0000, $0000, $0000, $0020 dw $0ee0, $0fc0, $00e0, $0f50, $3737, $0000, $0000, $0000, $0000, $0000, $0000, $0000, $0021 -dw $0070, $00a0, $0030, $0088, $4242, $0000, $0000, $0000, $0000, $0000, $0000, $0000, $0022 +dw $0458, $0540, $00e8, $04cc, $4242, $0000, $0000, $0000, $0000, $0000, $0000, $0000, $0022 dw $0058, $0058, $0000, $0058, $4048, $0000, $0000, $0000, $0000, $0000, $0000, $0000, $0023 dw $0178, $0178, $0000, $0178, $4048, $0000, $0000, $0000, $0000, $0000, $0000, $0000, $0024 dw $0388, $0388, $0000, $0388, $4049, $0000, $0000, $0000, $0000, $0000, $0000, $0000, $0025 @@ -509,7 +509,7 @@ OWWestEdges: dw $0070, $00a0, $0030, $0088, $0202, $0000, $0000, $0000, $0000, $0000, $0000, $0000, $0000 dw $0068, $0078, $0010, $0070, $0505, $0000, $0000, $0000, $0000, $0000, $0000, $0000, $0001 dw $0068, $0088, $0020, $0078, $0707, $0000, $0000, $0000, $0000, $0000, $0000, $0000, $0002 -dw $0318, $0368, $0050, $0340, $0d0d, $0000, $0000, $0000, $0000, $0000, $0000, $0000, $0003 +dw $0318, $0368, $0050, $0340, $050d, $0000, $0000, $0000, $0000, $0000, $0000, $0000, $0003 dw $0450, $0488, $0038, $046c, $1212, $0000, $0000, $0000, $0000, $0000, $0000, $0000, $0004 dw $0560, $05a0, $0040, $0580, $1212, $0000, $0000, $0000, $0000, $0000, $0000, $0000, $0005 dw $0488, $0500, $0078, $04c4, $1313, $0000, $0000, $0000, $0000, $0000, $0000, $0000, $0006 @@ -545,7 +545,7 @@ dw $0e28, $0fb8, $0190, $0ef0, $3c3c, $0000, $0000, $0000, $0000, $0000, $0000, dw $0f78, $0fb8, $0040, $0f98, $353d, $0000, $0000, $0000, $0000, $0000, $0000, $0000, $0023 dw $0f20, $0f40, $0020, $0f30, $3f3f, $0000, $0000, $0000, $0000, $0000, $0000, $0000, $0024 dw $0f70, $0fb8, $0048, $0f94, $3f3f, $0000, $0000, $0000, $0000, $0000, $0000, $0000, $0025 -dw $0458, $0540, $00e8, $04cc, $4242, $0000, $0000, $0000, $0000, $0000, $0000, $0000, $0026 +dw $0070, $00a0, $0030, $0088, $4242, $0000, $0000, $0000, $0000, $0000, $0000, $0000, $0026 dw $0068, $0078, $0010, $0070, $4545, $0000, $0000, $0000, $0000, $0000, $0000, $0000, $0027 dw $0068, $0088, $0020, $0078, $4747, $0000, $0000, $0000, $0000, $0000, $0000, $0000, $0028 dw $0318, $0368, $0050, $0340, $454d, $0000, $0000, $0000, $0000, $0000, $0000, $0000, $0029 @@ -585,7 +585,7 @@ OWEastEdges: dw $0070, $00a0, $0030, $0088, $0001, $0000, $0000, $0000, $0000, $0000, $0000, $0000, $0000 dw $0068, $0078, $0010, $0070, $0304, $0000, $0000, $0000, $0000, $0000, $0000, $0000, $0001 dw $0068, $0088, $0020, $0078, $0506, $0000, $0000, $0000, $0000, $0000, $0000, $0000, $0002 -dw $0318, $0368, $0050, $0340, $0b0c, $0000, $0000, $0000, $0000, $0000, $0000, $0000, $0003 +dw $0318, $0368, $0050, $0340, $030c, $0000, $0000, $0000, $0000, $0000, $0000, $0000, $0003 dw $0450, $0488, $0038, $046c, $1111, $0000, $0000, $0000, $0000, $0000, $0000, $0000, $0004 dw $0560, $05a0, $0040, $0580, $1111, $0000, $0000, $0000, $0000, $0000, $0000, $0000, $0005 dw $0488, $0500, $0078, $04c4, $1212, $0000, $0000, $0000, $0000, $0000, $0000, $0000, $0006 @@ -650,8 +650,8 @@ dw $0c50, $0db8, $0168, $0d04, $7272, $0000, $0000, $0000, $0000, $0000, $0000, dw $0c78, $0ce3, $006b, $0cad, $7373, $0000, $0000, $0000, $0000, $0000, $0000, $0000, $0042 dw $0ce4, $0d33, $004f, $0d0b, $7373, $0000, $0000, $0000, $0000, $0000, $0000, $0000, $0043 dw $0d34, $0db8, $0084, $0d76, $7373, $0000, $0000, $0000, $0000, $0000, $0000, $0000, $0044 -dw $0f18, $0f18, $0000, $0f18, $707a, $0000, $0000, $0000, $0000, $0000, $0000, $0000, $0045 -dw $0fc8, $0fc8, $0000, $0fc8, $707a, $0000, $0000, $0000, $0000, $0000, $0000, $0000, $0046 +dw $0f18, $0f18, $0000, $0f18, $7a7a, $0000, $0000, $0000, $0000, $0000, $0000, $0000, $0045 +dw $0fc8, $0fc8, $0000, $0fc8, $7a7a, $0000, $0000, $0000, $0000, $0000, $0000, $0000, $0046 dw $0e28, $0fb8, $0190, $0ef0, $7b7b, $0000, $0000, $0000, $0000, $0000, $0000, $0000, $0047 dw $0f78, $0fb8, $0040, $0f98, $7c7c, $0000, $0000, $0000, $0000, $0000, $0000, $0000, $0048 dw $0f20, $0f40, $0020, $0f30, $757e, $0000, $0000, $0000, $0000, $0000, $0000, $0000, $0049 diff --git a/data/base2current.bps b/data/base2current.bps index 8f52a8c183999426709529cdd21f2207382fa323..cb602d4ab521689d2a95afb0bf16cde6dba2d9b1 100644 GIT binary patch delta 267 zcmV+m0rdX6tO%;C2(T{!1bLQ*X@fHXmootYEChiD