From b8ffdb73c31625ed4652925865afe88759ba3212 Mon Sep 17 00:00:00 2001
From: JappaWakka <jjlspeelman@outlook.com>
Date: Wed, 18 Jan 2023 20:13:04 +0100
Subject: [PATCH] Teleport doesn't fail anymore if opp is faster

---
 .../BattleSystemV2/BattleCalculation.vb       |   6 +++++-
 P3D/Pokemon/Attacks/Psychic/Teleport.vb       | Bin 6356 -> 6368 bytes
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/P3D/Battle/BattleSystemV2/BattleCalculation.vb b/P3D/Battle/BattleSystemV2/BattleCalculation.vb
index 52196bd8d..68c4434d0 100644
--- a/P3D/Battle/BattleSystemV2/BattleCalculation.vb
+++ b/P3D/Battle/BattleSystemV2/BattleCalculation.vb
@@ -676,7 +676,7 @@
             Return False
         End Function
 
-        Public Shared Function CanRun(ByVal own As Boolean, ByVal BattleScreen As BattleScreen) As Boolean
+        Public Shared Function CanRun(ByVal own As Boolean, ByVal BattleScreen As BattleScreen, Optional ByVal IsEscapeMove As Boolean = False) As Boolean
             If BattleScreen.BattleMode = BattleScreen.BattleModes.Safari Then
                 Return True
             End If
@@ -736,6 +736,10 @@
                 Return False
             End If
 
+            If IsEscapeMove = True Then
+                Return True
+            End If
+
             If p.Speed > op.Speed Then
                 Return True
             Else
diff --git a/P3D/Pokemon/Attacks/Psychic/Teleport.vb b/P3D/Pokemon/Attacks/Psychic/Teleport.vb
index 0ea9d04cf75078b49662588655a3b34ffcf657d4..91973d3d26c3a81a3f8e60461d64f81a3c364dcf 100644
GIT binary patch
delta 24
gcmca&_`q<(Z((j71_g!?h9ZVihSbf!gm19`0B%?aY5)KL

delta 12
TcmaE0c*StTZ{f}CA~#t8DFg+8