From aa5c3b63a2a64b1be77de0c9f763d449e6173927 Mon Sep 17 00:00:00 2001
From: Catobat <69204835+Catobat@users.noreply.github.com>
Date: Fri, 24 Feb 2023 13:14:19 +0100
Subject: [PATCH] Fix swim state when leaving Hobo area

---
 owrando.asm | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/owrando.asm b/owrando.asm
index 363d958..09fe010 100644
--- a/owrando.asm
+++ b/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
 }