From 98ca5fdcd0241fb1e3ef95b3c6808c956e58dce6 Mon Sep 17 00:00:00 2001
From: darkfire006 <blazer257@live.com>
Date: Mon, 3 Aug 2020 14:13:57 -0500
Subject: [PATCH] Battle Tower fixes

---
 P3D/Battle/Trainer.vb                         |   2 +-
 .../battletower/challenge/wonbrain.dat        | Bin 3936 -> 3932 bytes
 .../trainer/frontier/battletower/138.trainer  | Bin 1274 -> 1274 bytes
 .../trainer/frontier/battletower/148.trainer  | Bin 1352 -> 1352 bytes
 .../trainer/frontier/battletower/271.trainer  | Bin 1250 -> 1250 bytes
 .../trainer/frontier/battletower/38.trainer   | Bin 1198 -> 1198 bytes
 .../trainer/frontier/battletower/74.trainer   | Bin 1284 -> 1276 bytes
 P3D/Pokemon/Monster/Pokemon.vb                |   4 ++--
 8 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/P3D/Battle/Trainer.vb b/P3D/Battle/Trainer.vb
index 15faf6a3d..eb358a15d 100644
--- a/P3D/Battle/Trainer.vb
+++ b/P3D/Battle/Trainer.vb
@@ -207,7 +207,7 @@ Public Class Trainer
             Dim PokeData As String = PokeLine.GetSplit(1, "|")
             If PokeData <> "" Then
                 If ScriptCommander.Parse(PokeData).ToString().StartsWith("{") = True Then
-                    PokeData = ScriptCommander.Parse(PokeData).ToString().Replace("§", ",")
+                    PokeData = ScriptCommander.Parse(PokeData).ToString().Replace("§", ",").Replace("«", "[").Replace("»", "]")
                 End If
                 If PokeData.StartsWith("{") = True And PokeData.EndsWith("}") = True Then
                     Dim p As Pokemon = Pokemon.GetPokemonByData(PokeData)
diff --git a/P3D/Content/Data/Scripts/frontier/battletower/challenge/wonbrain.dat b/P3D/Content/Data/Scripts/frontier/battletower/challenge/wonbrain.dat
index 6ccdb2d34fafe699f44327252b6bd7960160838b..ce6132be4992710e85c16a12e93fc0009cc0fae6 100644
GIT binary patch
delta 17
YcmaDLcSml68RKRPMgykJS<K(K0X$s>9{>OV

delta 19
acmca3_dsrg8RKRXMk6Lhz0Il2-?;%rKn6$v

diff --git a/P3D/Content/Data/Scripts/trainer/frontier/battletower/138.trainer b/P3D/Content/Data/Scripts/trainer/frontier/battletower/138.trainer
index 32868b8aa994c7574503ffee405cc1956372536c..8dbe9f2a8d6e30d9a8481037d36ed681b1f0f5f3 100644
GIT binary patch
delta 20
bcmeyx`HOSH5l#h$NQQidQii&XXLVTsPx=P#

delta 20
bcmeyx`HOSH5zab>NQQidQU-;MXLVTsQtAfo

diff --git a/P3D/Content/Data/Scripts/trainer/frontier/battletower/148.trainer b/P3D/Content/Data/Scripts/trainer/frontier/battletower/148.trainer
index b316447d51b0f74dd185d5e849f81a4e472e37bb..623056414437786cd900622f3f5fc60e5eb31696 100644
GIT binary patch
delta 34
ocmX@Xb%JZcF>wWkWQKf(JceS1OokMORE8oTPGP9qcsH8`0Ip{V%>V!Z

delta 34
ocmX@Xb%JZcG4VQvWQKf(JceS1OokMORE8oTPGL~kcsH8`0JeJx%>V!Z

diff --git a/P3D/Content/Data/Scripts/trainer/frontier/battletower/271.trainer b/P3D/Content/Data/Scripts/trainer/frontier/battletower/271.trainer
index f65cb34617e579713ae574104de1becfade038b1..4141b96697dcf77263b49c8ab3a5f6f1b47092ff 100644
GIT binary patch
delta 32
mcmaFF`G|AEIng?XB!)zW5+KZB$YjW4NN2ETP}unRKQjQUz6ufm

delta 32
mcmaFF`G|AEIZ*|MB!)zW5+KZB$YjW4NN2ETsN4AXKQjQNW(pDj

diff --git a/P3D/Content/Data/Scripts/trainer/frontier/battletower/38.trainer b/P3D/Content/Data/Scripts/trainer/frontier/battletower/38.trainer
index afba9534422ea378627a92b401d0e7734ab1a2e9..7dfb89e40ba26eed7e7c9ab28d7c17098e8bbb14 100644
GIT binary patch
delta 40
vcmZ3-xsG$f8c79)T!u;p1%?2Ie1>d>mq1=VLmopNL*nFIM){3TPB8-j;FAle

delta 40
tcmZ3-xsG$f8p%3_T!u;p1%?2Ie1>d>mq1=VLmrTyI60S5e&dr<%mC=83#b49

diff --git a/P3D/Content/Data/Scripts/trainer/frontier/battletower/74.trainer b/P3D/Content/Data/Scripts/trainer/frontier/battletower/74.trainer
index bdda2a727a82a16f2b4932c01dcb9984c01daf47..432841f20c672c57ee556b72236e1e80e0078ef8 100644
GIT binary patch
delta 16
XcmZqS`olS46KerODMQJ|{jMwkG_eKk

delta 24
ecmeyv*}^qp6K^s@216o49uTH7<ZRsT$^rmlmj`VC

diff --git a/P3D/Pokemon/Monster/Pokemon.vb b/P3D/Pokemon/Monster/Pokemon.vb
index f1cbf07e9..ef2ebcb6b 100644
--- a/P3D/Pokemon/Monster/Pokemon.vb
+++ b/P3D/Pokemon/Monster/Pokemon.vb
@@ -1230,7 +1230,7 @@ Public Class Pokemon
     ''' <param name="InputData">The data that defines the Pokémon.</param>
     Public Shared Function GetPokemonByData(ByVal InputData As String) As Pokemon
         Dim Tags As New Dictionary(Of String, String)
-        Dim Data() As String = InputData.Split(CChar("}"))
+        Dim Data() As String = InputData.Replace("§", ",").Replace("«", "[").Replace("»", "]").Split(CChar("}"))
         For Each Tag As String In Data
             If Tag.Contains("{") = True And Tag.Contains("[") = True Then
                 Dim TagName As String = Tag.Remove(0, 2)
@@ -1515,7 +1515,7 @@ Public Class Pokemon
         Dim loadedHP As Boolean = False
 
         Dim Tags As New Dictionary(Of String, String)
-        Dim Data() As String = InputData.Split(CChar("}"))
+        Dim Data() As String = InputData.Replace("§", ",").Replace("«", "[").Replace("»", "]").Split(CChar("}"))
         For Each Tag As String In Data
             If Tag.Contains("{") = True And Tag.Contains("[") = True Then
                 Dim TagName As String = Tag.Remove(0, 2)