From b549860fb8e2b1d82d85bd1e5e196e493cb63188 Mon Sep 17 00:00:00 2001 From: codemann8 Date: Sun, 19 Mar 2023 12:21:43 -0500 Subject: [PATCH] Fixed issue with no Woods mosiac on exit in vanilla OW --- Rom.py | 2 +- asm/owrando.asm | 5 +++-- data/base2current.bps | Bin 105928 -> 105930 bytes 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Rom.py b/Rom.py index 87860b0c..9760d525 100644 --- a/Rom.py +++ b/Rom.py @@ -38,7 +38,7 @@ from source.dungeon.RoomList import Room0127 JAP10HASH = '03a63945398191337e896e5771f77173' -RANDOMIZERBASEHASH = '109fde24581211c605a1d4836dd8d470' +RANDOMIZERBASEHASH = '281fb186ab9e30f98e9705398653a754' class JsonRom(object): diff --git a/asm/owrando.asm b/asm/owrando.asm index 4730478d..6bafb688 100644 --- a/asm/owrando.asm +++ b/asm/owrando.asm @@ -1111,11 +1111,12 @@ OWDetermineScreensPaletteSet: ; A = OWID to check } OWSkipMosiac: { + PHA LDA.l OWMode : ORA.l OWMode+1 : BEQ .vanilla - PLA : PLA : PEA $A9F2 + PLA : PLA : PLA : PEA $A9F2 RTL .vanilla - LDA.b $8A : AND.b #$3F : BNE + ; what we wrote over, kinda + PLA : AND.b #$3F : BNE + ; what we wrote over, kinda PLA : PLA : PEA $A9E3 + RTL diff --git a/data/base2current.bps b/data/base2current.bps index 13b9ab4e536d50ae220897ada064df65d5f345af..5b85faf181a91c9020324b8e6b46453dbb8ecb1f 100644 GIT binary patch delta 115 zcmV-(0F3|0y9Ua;2C!uT17|syvuFW?0|9fB?F1w-*HgygwYB@B{kjVESN4 zqdW2Ji&U{03{^cEJKy$wqDt VfS*aXKScq7SP0VtSmJGRK$6CBFmwO_ delta 113 zcmV-%0FM94y9UU+2C!uT15-JyvuFW?0|9cA?F1to#P>1kL;gYu|Rk0$a&OZVrH- TOSeHq0fATuO7?LUyF185gt9O<