From f4e5202bf296f029b39c90be410f2488c6de3b6c Mon Sep 17 00:00:00 2001
From: codemann8 <codemann8@gmail.com>
Date: Thu, 24 Jun 2021 14:47:57 -0500
Subject: [PATCH] Fixed VRAM issue

---
 Rom.py                |   2 +-
 asm/owrando.asm       |  19 +++++++++----------
 data/base2current.bps | Bin 138509 -> 138498 bytes
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/Rom.py b/Rom.py
index a6248c03..49129767 100644
--- a/Rom.py
+++ b/Rom.py
@@ -27,7 +27,7 @@ from EntranceShuffle import door_addresses, exit_ids
 
 
 JAP10HASH = '03a63945398191337e896e5771f77173'
-RANDOMIZERBASEHASH = '35a3f01c05c95b6a420f9bd6220c56a2'
+RANDOMIZERBASEHASH = '67e74fd94251d532ec723143f008289a'
 
 
 class JsonRom(object):
diff --git a/asm/owrando.asm b/asm/owrando.asm
index 2891d941..60feff3b 100644
--- a/asm/owrando.asm
+++ b/asm/owrando.asm
@@ -231,18 +231,17 @@ OWNewDestination:
         inc : pha : lda $06 : and #$fe00 : !add 1,s : sta $06 : pla
 
         ; adjust and set other VRAM addresses
-        lda OWMode : and #$00ff : bne .modifyOtherVram
-            lda.w $0006,x : pha : lda $06 : !sub 1,s 
-            jsl DivideByTwoPreserveSign : jsl DivideByTwoPreserveSign : jsl DivideByTwoPreserveSign : jsl DivideByTwoPreserveSign : pha ; number of tiles
-            lda $418 : dec #2 : bmi +
-                pla : pea $0000 : bra ++ ;pla : asl #7 : pha : bra ++ ; y-axis shifts VRAM by increments of 0x80 (disabled for now)
-            + pla : asl : pha ; x-axis shifts VRAM by increments of 0x02
-            ++ lda $84 : !add 1,s : sta $84 : pla : pla
-        .modifyOtherVram
-        LDA $84 : SEC : SBC #$0400 : AND #$0F00 : ASL : XBA : STA $88
-        LDA $84 : SEC : SBC #$0010 : AND #$003E : LSR : STA $86
+        lda.w $0006,x : pha : lda $06 : !sub 1,s 
+        jsl DivideByTwoPreserveSign : jsl DivideByTwoPreserveSign : jsl DivideByTwoPreserveSign : jsl DivideByTwoPreserveSign : pha ; number of tiles
+        lda $418 : dec #2 : bmi +
+            pla : pea $0000 : bra ++ ;pla : asl #7 : pha : bra ++ ; y-axis shifts VRAM by increments of 0x80 (disabled for now)
+        + pla : asl : pha ; x-axis shifts VRAM by increments of 0x02
+        ++ lda $84 : !add 1,s : sta $84 : pla : pla
 
     .adjustMainAxis
+    LDA $84 : SEC : SBC #$0400 : AND #$0F00 : ASL : XBA : STA $88 ; vram
+    LDA $84 : SEC : SBC #$0010 : AND #$003E : LSR : STA $86
+
     pla : pla : sep #$10 : ldy $418
     ldx OWCoordIndex,y : lda $20,x : and #$fe00 : pha
         lda $20,x : and #$01ff : pha ;s1 = relative cur, s3 = ow cur
diff --git a/data/base2current.bps b/data/base2current.bps
index 5ee188100508f0699b27bcabc93d2ecf9226aa83..67898234c91626163a48a15982809ff7536cde05 100644
GIT binary patch
delta 174
zcmV;f08#&qx(I^02(UB(4XH2!3k3iH0G$kC^K`RB0UQAXGjD>kVgmd9Iz@n_Agve#
zIyw*nq#~Fp{{h1TkVQJf0kA+CNTmiT0R9+b0fh!=y#@eCr3N_T0U{`fs;}ySNR#oE
zpaDezT9xJjegPYoWdQ*!0UVc-0RcS$WtY$a0X-5l5vHw4K*>PR5v5(p7w{INIhP*-
c0U84v-#~{v0s*%?0s_ez2z8BD_nwo(*}cd+g#Z8m

delta 205
zcmV;;05boAx(JQB2(UB(5T!5z3k3iH009a9mU~`<V6#C1903A6?z3P5`~5>@fTSR;
z7z8>x5CWtkm?{4O!vm0JI>Q05VH!xK1}Omk7-Ip2257AUfGPg~&@;UT07#_<IO72#
zD2S@B`hiH30f3d20Yw37mD>S+0V|hU0Rb!lESHA?0X+eAm&E}AJugHNrmaap$w1H%
zrCrGv@D`&<c&43z3#DDj7tjTh2Y{8O1%-;jFhhVpCiHvWP=_%B0k<&%0?8T(V+NBZ
HCv<z?d>csz