From 9cef1ff32ecba701b7ccec40a8cc6483625df31a Mon Sep 17 00:00:00 2001
From: codemann8 <codemann8@gmail.com>
Date: Mon, 3 Apr 2023 08:21:34 -0500
Subject: [PATCH] Temporary fix for avoiding VRAM issues in non-layout OWR
 modes

---
 Rom.py                |   2 +-
 asm/owrando.asm       |  36 +++++++++++++++++++-----------------
 data/base2current.bps | Bin 105975 -> 105987 bytes
 3 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/Rom.py b/Rom.py
index fb0cf141..c164e845 100644
--- a/Rom.py
+++ b/Rom.py
@@ -38,7 +38,7 @@ from source.dungeon.RoomList import Room0127
 
 
 JAP10HASH = '03a63945398191337e896e5771f77173'
-RANDOMIZERBASEHASH = '0dd61456cc38a4792d99d23047163660'
+RANDOMIZERBASEHASH = '92c16c60f26218c9aec838ce204c0b1e'
 
 
 class JsonRom(object):
diff --git a/asm/owrando.asm b/asm/owrando.asm
index a308a9fc..c4f512b0 100644
--- a/asm/owrando.asm
+++ b/asm/owrando.asm
@@ -860,31 +860,33 @@ OWNewDestination:
 {
     tya : sta $4202 : lda #16 : sta $4203 ;wait 8 cycles
     rep #$20 : txa : nop : !add $4216 : tax ;a = offset to dest record
-    lda.w $0006,x : sta $06 ;set coord
     lda.w $0008,x : sta $04 ;save dest OW slot/ID
-    lda.w $000a,x : sta $84 ;VRAM
-
+    ldy $20 : lda $418 : dec #2 : bpl + : ldy $22 : + sty $06
+    
     ;;22	e0	e2	61c	61e - X
     ;;20	e6	e8	618	61a - Y
     ;keep current position if within incoming gap
     lda.w $0000,x : and #$01ff : pha : lda.w $0002,x : and #$01ff : pha
-    ldy $20 : lda $418 : dec #2 : bpl + : ldy $22
-    + tya : and #$01ff : cmp 3,s : !blt .adjustMainAxis
-    dec : cmp 1,s : !bge .adjustMainAxis
-        inc : pha : lda $06 : and #$fe00 : !add 1,s : sta $06 : pla
+    LDA.l OWMode : AND.w #$0007 : BEQ .noLayoutShuffle ;temporary fix until VRAM issues are solved
+        lda.w $0006,x : sta $06 ;set coord
+        lda.w $000a,x : sta $84 ;VRAM
+        tya : and #$01ff : cmp 3,s : !blt .adjustMainAxis
+        dec : cmp 1,s : !bge .adjustMainAxis
+            inc : pha : lda $06 : and #$fe00 : !add 1,s : sta $06 : pla
 
-        ; adjust and set other VRAM addresses
-        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
+            ; adjust and set other VRAM addresses
+            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
+        .adjustMainAxis
+        LDA $84 : SEC : SBC #$0400 : AND #$0F00 : ASL : XBA : STA $88 ; vram
+        LDA $84 : SEC : SBC #$0010 : AND #$003E : LSR : STA $86
 
+    .noLayoutShuffle
     LDA.w $000F,X : AND.w #$00FF : STA.w $06FC ; position to walk to after transition (if non-zero)
 
     LDY.w #$0000
diff --git a/data/base2current.bps b/data/base2current.bps
index 617b02c3657f10d281afa5b62b17ac7efbe2b7d0..6efe11ee423d08175e56237349ff9b06c40a44eb 100644
GIT binary patch
delta 435
zcmV;k0Zjh)y9R^22C!uT1o%Y<y0d8kt^xsnlNbcr0il!g1StX8gB=C89R&d?HUY)A
zM>_#R1Oc3via!Az1qFd1oRpWVKLJ1iHJ9u^0c-)qw^={|9|1iLfWjb(>KJVnLaMz8
z0EGmkAgve#Iyw*nq#}d{y#N3y{{cw70+UjLlVxd@QGf>k@Nm5b0EGs<3IK(Km#aYm
zC?Hg7m4Qf;H-ODB259sE0DuE%3P`1d7-Ip2glK4+T@jb?K><ere3v*v0gVC^4VTA4
z0V@GSm-9jaJOT?=moY;DAq>Tori!Hng^Gp+ARCunLjf!j#gt&12rM0dfeN2gp3%?)
zOrMvWLjffLl9$3m0VD=QmVj&^M3?MC0XH2)mZe?E1keW}DwqeHMFXogLkobH0Dy@X
z&;px5mq0`THxx>ArmbXMzyZ)ZrCrGc@HLaklTDY4L;)EpLJkRl!TP0L$rsQEsRNAz
z2V`Af!XTG>iXngk@EqbGrHUy(@D!zrAYPZyL;)WHR}Gi(L;)NDP?rux0YL$Emrz9k
d76~87Ms5y(pKW8eZ$$xsSO_8Z;054YAG+hym?Z!J

delta 458
zcmV;*0X6=EyaxBX2C!uT1gJ_^wX<mft^xsclNbcr0hW{V1StW|gB=C89R&d?HUYY~
zM>_#R1Obtkia!Az1dEJ$fS0U40YCvqm+e0RYyrBrT0j9G0W$%B!XS$37;P3ps=WpP
zg$BI{0EGm-3IK(Ky#N3y{{cw70+URFMS!Frtr!G4IuHV+BA2#70Vo~nfk>0_%`gUN
z^Z)>W1853JrGyw`0fmHUXqycZm;ONkM*(J+MnVCN0(}gZ)j|O)0WOyTLjgPjbyb%?
zLjfTSx|F7hr3HnGh6NxHmuy1;EE2kuV4Dam9e{xfpH!aF&;v}Am#RYnB>{(*&_e+v
z20501Y#=$8`a=OX9XXbzUC9K{2O=t%2b@I%s~|%QfR_M(i5JiUn=6-2L;*KhG<2q|
zWL>}k&^x7F$pr8<lgX1e4hewG4y9em7w`zF1chCkKm%af8jS-7qbv>yfPH}arCrGv
z&<CjljROZ{U0}i>uL6LoDF*`Z9O59QiYY(v6s3wFQ<vOC0UrV{8JGP;0UQB3ml{O@
zK_Fj66M)6$5oEAyto#P>1kL;gYu|Rk0!zq7ZVrH-17x>*MFD_V2yXp*z6tzCs2B{T
A2mk;8