From ca7e4de35c562d066aff5c672f8953436d70920a Mon Sep 17 00:00:00 2001 From: codemann8 Date: Wed, 8 Nov 2023 23:10:34 -0600 Subject: [PATCH] Marking OW screens as visited --- Rom.py | 2 +- asm/owrando.asm | 13 +++++++++++++ data/base2current.bps | Bin 107715 -> 107745 bytes 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/Rom.py b/Rom.py index f11ced3b..3a82aa7c 100644 --- a/Rom.py +++ b/Rom.py @@ -38,7 +38,7 @@ from source.dungeon.RoomList import Room0127 JAP10HASH = '03a63945398191337e896e5771f77173' -RANDOMIZERBASEHASH = 'd1f78b0b0a4aad1523ad0068dd24aa50' +RANDOMIZERBASEHASH = 'fe9e7870071daa40829c1072829bf30b' class JsonRom(object): diff --git a/asm/owrando.asm b/asm/owrando.asm index 16c60aee..485bab50 100644 --- a/asm/owrando.asm +++ b/asm/owrando.asm @@ -29,6 +29,9 @@ BCS OWDetectTransitionReturn org $02a999 jsl OWEdgeTransition : nop #4 ;LDA $02A4E3,X : ORA $7EF3CA +org $02aa07 +JSL OWMarkVisited : NOP + org $04e8ae JSL OWDetectSpecialTransition RTL : NOP @@ -340,6 +343,16 @@ OWOldManSpeed: lda #$0c : sta $5e ; what we wrote over rtl } +OWMarkVisited: +{ + LDX.b $8A : STZ.w $0412 ; what we wrote over + LDA.b $10 : CMP.b #$14 : BCS .return + LDA.l OverworldEventDataWRAM,X + ORA.b #$80 : STA.l OverworldEventDataWRAM,X + + .return + RTL +} LoadMapDarkOrMixed: { diff --git a/data/base2current.bps b/data/base2current.bps index ec152a61ce211a64429ba9a4a4c12b4aa3eb0a40..a21ad3abf7406231397ccf4c057391d8ef5b7d7a 100644 GIT binary patch delta 395 zcmV;60d)Su$p+!c2C#ks1R-1Aq_ctn#{vonfRQ3`iK^-(fU`>kAO!)9vup|L1p$Y% zSP#N70U(1LLYEst0q0I3fba^Xpeg>z@bD0T2BnJ01Mmo?Udaq=WL|5j42526riz>r z1f>wk6tI_UG>?UVpO1{K$ppeM@DQT@1HC!dmT(n`jrM|Q0GD4gkC!_`0U`nnikDwQ z0b@yui&~qnLGpen0!YvWsT++i0j~hOs_>U%ZjTj$CX28CyQ;~s&;_Y^Oa_a|LeK{y zSgi(33X91!&;_a4Oa_a|HP8jA+DrzEmkLAyHw86~s*?kkMnnNR0X3I_L;;sU7K)vK z*yz0gyV^*XR}%t&g(CrHrI7#t delta 302 zcmaEOlI`$GwheWREK13D=WK3bJkG@A(zrR8MS+#Ed~*rsYgWd>%?bR6j2O9^m7S(5 zJ25_I)SS-k%&0Kk-kDL1Nv~mggfpWO)3?s)HO`F5j3v__I5SG=whDCjch@$a+;D+) zWu?!Du9Hp|*p(vIviW@JI%xtFy9p9A1u|{{8Phdf7|mJbdsj_noSx#sXvHW$eZC9h zbjPgDxeYg7>}A+}%VWB>FjGUTGUI#^UZ#eNi