From 9ab52072718bee72f666cd62b4df26a0b658d778 Mon Sep 17 00:00:00 2001
From: CaptainSegis <F20121237@outlook.com>
Date: Thu, 12 Jan 2017 15:35:50 -0500
Subject: [PATCH] Fixed synchronize and teleport interaction

---
 .../2.5DHero/Battle/BattleSystemV2/Battle.vb  |   6 +++++-
 .../Pokemon/Attacks/Psychic/Teleport.vb       | Bin 6384 -> 6510 bytes
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/2.5DHero/2.5DHero/Battle/BattleSystemV2/Battle.vb b/2.5DHero/2.5DHero/Battle/BattleSystemV2/Battle.vb
index fbfbf0b2e..22e899c31 100644
--- a/2.5DHero/2.5DHero/Battle/BattleSystemV2/Battle.vb
+++ b/2.5DHero/2.5DHero/Battle/BattleSystemV2/Battle.vb
@@ -7,6 +7,7 @@
 
 
         Public IsAfterFaint As Boolean = False
+        Public WildHasEscaped As Boolean = False
 #Region "StartRound"
 
         Public Structure RoundConst
@@ -1043,7 +1044,10 @@
                 p = BattleScreen.OppPokemon
                 op = BattleScreen.OwnPokemon
             End If
-
+            If WildHasEscaped Then
+                WildHasEscaped = False
+                Exit Sub
+            End If
             'Transform Aegislash with Stance Change ability.
             If p.Ability.Name.ToLower() = "stance change" AndAlso p.Number = 681 Then
                 If p.AdditionalData = "" Then
diff --git a/2.5DHero/2.5DHero/Pokemon/Attacks/Psychic/Teleport.vb b/2.5DHero/2.5DHero/Pokemon/Attacks/Psychic/Teleport.vb
index 5d65f695a4dbb1a486c6054938840a2bc2d77ff2..517bf6a317f813c1494e0d8f717c5b5e74404644 100644
GIT binary patch
delta 46
zcmexh_|9m<R#90!hH!>Vh8%_z1`mcrhGGU+AWjCd3K&uuQYNqB(cWAyTF49lI=Bp%

delta 16
YcmaE7^uch$R?*2X#cej{i~VN;07y*-!~g&Q