From ef0cecfe2e81ec918fef3d95c58dce6f89b737c1 Mon Sep 17 00:00:00 2001
From: Vitaly Mikhailov <personal@aragas.org>
Date: Thu, 31 Oct 2019 23:48:31 +0300
Subject: [PATCH] Added <battle.caught> command

---
 P3D/Battle/BattleSystemV2/Battle.vb                    | 1 +
 P3D/Battle/BattleSystemV2/BattleScreen.vb              | 2 ++
 P3D/Screens/Battle/BattleCatchScreen.vb                | 1 +
 P3D/World/ActionScript/V2/ScriptConstructs/DoBattle.vb | 2 ++
 4 files changed, 6 insertions(+)

diff --git a/P3D/Battle/BattleSystemV2/Battle.vb b/P3D/Battle/BattleSystemV2/Battle.vb
index ff24efb2d..1f8313d16 100644
--- a/P3D/Battle/BattleSystemV2/Battle.vb
+++ b/P3D/Battle/BattleSystemV2/Battle.vb
@@ -4,6 +4,7 @@
 
         Public Shared Won As Boolean = False
         Public Shared Fled As Boolean = False
+        Public Shared Caught As Boolean = False
 
 
         Public IsAfterFaint As Boolean = False
diff --git a/P3D/Battle/BattleSystemV2/BattleScreen.vb b/P3D/Battle/BattleSystemV2/BattleScreen.vb
index d51444de8..7feaa4d86 100644
--- a/P3D/Battle/BattleSystemV2/BattleScreen.vb
+++ b/P3D/Battle/BattleSystemV2/BattleScreen.vb
@@ -122,6 +122,8 @@
             Me.IsTrainerBattle = False
             Me.MouseVisible = False
             Me.PVPGameJoltID = ""
+            'Reset variable when new battle starts
+            BattleSystem.Battle.Caught = False
         End Sub
 
         Public Sub New(ByVal Trainer As Trainer, ByVal OverworldScreen As Screen, ByVal defaultMapType As Integer)
diff --git a/P3D/Screens/Battle/BattleCatchScreen.vb b/P3D/Screens/Battle/BattleCatchScreen.vb
index 959314a39..166f66f3d 100644
--- a/P3D/Screens/Battle/BattleCatchScreen.vb
+++ b/P3D/Screens/Battle/BattleCatchScreen.vb
@@ -161,6 +161,7 @@
                                 AnimationStarted = False
                                 SetupAnimation()
                                 CatchPokemon()
+                                BattleSystem.Battle.Caught = True
                             Case 8
                                 AnimationIndex = 9
                                 If showPokedexEntry = True Then
diff --git a/P3D/World/ActionScript/V2/ScriptConstructs/DoBattle.vb b/P3D/World/ActionScript/V2/ScriptConstructs/DoBattle.vb
index 71936e9ef..d0d1677b9 100644
--- a/P3D/World/ActionScript/V2/ScriptConstructs/DoBattle.vb
+++ b/P3D/World/ActionScript/V2/ScriptConstructs/DoBattle.vb
@@ -25,6 +25,8 @@
                     Return t.OutroMessage
                 Case "won"
                     Return ReturnBoolean(BattleSystem.Battle.Won)
+                Case "caught"
+                    Return ReturnBoolean(BattleSystem.Battle.Caught)
             End Select
 
             Return DEFAULTNULL