From 7ba0f97b23851ad4eedaeb5cab3e1b02ef35d3e7 Mon Sep 17 00:00:00 2001 From: codemann8 Date: Wed, 24 Nov 2021 15:56:20 -0600 Subject: [PATCH 1/2] Fix mirror portals getting erased when changing worlds --- Rom.py | 9 ++++----- data/base2current.bps | Bin 141347 -> 141365 bytes 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Rom.py b/Rom.py index a86cde36..30729de4 100644 --- a/Rom.py +++ b/Rom.py @@ -33,7 +33,7 @@ from source.classes.SFX import randomize_sfx JAP10HASH = '03a63945398191337e896e5771f77173' -RANDOMIZERBASEHASH = '1a9145bd70bf9b28f7a3fe7ba38fc7ab' +RANDOMIZERBASEHASH = '383fbac5f195f82d2b74b62113229fac' class JsonRom(object): @@ -1432,10 +1432,9 @@ def patch_rom(world, rom, player, team, enemized, is_mystery=False): rom.write_byte(0x18004A, 0x00 if world.mode[player] != 'inverted' else 0x01) # Inverted mode rom.write_byte(0x18005D, 0x00) # Hammer always breaks barrier - rom.write_byte(0x2AF79, 0xD0 if world.mode[player] != 'inverted' else 0xF0) # vortexes: Normal (D0=light to dark, F0=dark to light, 42 = both) - rom.write_byte(0x3A943, 0xD0 if world.mode[player] != 'inverted' else 0xF0) # Mirror: Normal (D0=Dark to Light, F0=light to dark, 42 = both) - rom.write_byte(0x3A96D, 0xF0 if world.mode[player] != 'inverted' else 0xD0) # Residual Portal: Normal (F0= Light Side, D0=Dark Side, 42 = both (Darth Vader)) - rom.write_byte(0x3A9A7, 0xD0) # Residual Portal: Normal (D0= Light Side, F0=Dark Side, 42 = both (Darth Vader)) + rom.write_byte(0x03A943, 0xD0 if world.mode[player] != 'inverted' else 0xF0) # Mirror: Normal (D0=Dark to Light, F0=light to dark, 42 = both) + rom.write_byte(0x03A96D, 0xF0 if world.mode[player] != 'inverted' else 0xD0) # Residual Portal: Normal (F0= Light Side, D0=Dark Side, 42 = both (Darth Vader)) + rom.write_byte(0x03A9A7, 0xD0) # Residual Portal: Normal (D0= Light Side, F0=Dark Side, 42 = both (Darth Vader)) rom.write_bytes(0x180080, [50, 50, 70, 70]) # values to fill for Capacity Upgrades (Bomb5, Bomb10, Arrow5, Arrow10) diff --git a/data/base2current.bps b/data/base2current.bps index e22c046f7e4cbaa92de854c693494b074c8fad6c..db61bf4dc810344f4da2cd6d315433687ca0d576 100644 GIT binary patch delta 205 zcmV;;05boh&31Ze%20<%p4rUn7Uv-Af-1O?TIs$7ecK@1&}PYec=UJQ@{ zp_A_n7Xg8j2Ms9^E0~FOu%O_LB6YB!bby;uo3lU-HTGPA0hdXAqnQV<%JY8k2$Kz9 zfRAvg4S=cMNNcYJfT}40&;=r$=>lu722g*=0q_JOo#_Ip0FMSxe`}UN2#BH31YEth z3hn>`ml!mqrSJ@;^2tEZ2B`s)s;@nlzykp#0V|j00|7$;YKJNW0k31c?N8`?E~}rUn7Hv-Af-1O>>5s$7ecK@1&}PYec=UJQ@{ zl#}la7XfsW2Ms9@6IzguIiuW<3%7KDn`}9evq23t_Dj71Yp=@le$WAHXsO;vYp(^9 zo3#ZZo#_H=uLe+m$pP>LkJy>10FMSxe`}UN2#BH31YEth3hn>`mzkyT45jkPK+p!M p0h6k)BbU+x0VM%nm-qt#Ljh2SJOlx^JOl#qBM2s~iL&bp&qLw#OfUcd From c883690ea37ea0b616b6cde51f6dd4da1b12f75c Mon Sep 17 00:00:00 2001 From: codemann8 Date: Wed, 24 Nov 2021 15:57:25 -0600 Subject: [PATCH 2/2] Version bump 0.2.3.2 --- CHANGELOG.md | 2 +- OverworldShuffle.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 99c25c1e..93f9b2f2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -### 0.2.3.0/1 +### 0.2.3.0/1/2 - Fixed issue in Crossed OW where mirror portal sprites would disappear when changing worlds - Added Big Red Bomb logic to support using residual mirror portals for later re-entry - Suppressed irrelevant paths in spoiler playthru diff --git a/OverworldShuffle.py b/OverworldShuffle.py index 25a49111..f5729ab3 100644 --- a/OverworldShuffle.py +++ b/OverworldShuffle.py @@ -3,7 +3,7 @@ from BaseClasses import OWEdge, WorldType, RegionType, Direction, Terrain, PolSl from Regions import mark_dark_world_regions, mark_light_world_regions from OWEdges import OWTileRegions, OWTileGroups, OWEdgeGroups, OWExitTypes, OpenStd, parallel_links, IsParallel -__version__ = '0.2.3.1-u' +__version__ = '0.2.3.2-u' def link_overworld(world, player): # setup mandatory connections