Merged in DR v1.2.0.9

2023-02-24 16:14:00 -06:00
parent 121c9424c1 409f7d50d5
commit 4caee1cbec
12 changed files with 152 additions and 63 deletions
--- a/asm/owrando.asm
+++ b/asm/owrando.asm
@@ -608,16 +608,18 @@ OWEdgeTransition:
 }
 OWSpecialExit:
 {
-    PHY
-    LDY.b #$00
-    LDA.w $0418 : LSR : BNE +
-        LDY.w $0704 : BRA ++
-    +
-    LDA.w $0704 : BNE ++
-        LDY.b #$02
-    ++
-    JSR OWWorldTerrainUpdate
-    PLY
+    LDA.l OWMode : ORA.l OWMode+1 : BEQ .vanilla
+        PHY
+        LDY.b #$00
+        LDA.w $0418 : LSR : BNE +
+            LDY.w $0704 : BRA ++
+        +
+        LDA.w $0704 : BNE ++
+            LDY.b #$02
+        ++
+        JSR OWWorldTerrainUpdate
+        PLY
+    .vanilla
    LDA.l $7EFD40,X ; what we wrote over
    RTL
 }