From d9b7e2258b66dc4b13ca4b4dc5e0c7ab82520da8 Mon Sep 17 00:00:00 2001
From: JappaWakka <jjlspeelman@outlook.com>
Date: Sat, 15 Feb 2025 19:10:09 +0100
Subject: [PATCH] Revert "Use [ ] instead of < > for pkmn catchinfo tokens.."

This reverts commit 2fa95df3e7dc573c925cd02c3a7b96fb07b924dc.
---
 P3D/Pokemon/Monster/Pokemon.vb       | 18 +++++++++---------
 P3D/Screens/Pokemon/SummaryScreen.vb |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/P3D/Pokemon/Monster/Pokemon.vb b/P3D/Pokemon/Monster/Pokemon.vb
index 863feb124..1ad55042c 100644
--- a/P3D/Pokemon/Monster/Pokemon.vb
+++ b/P3D/Pokemon/Monster/Pokemon.vb
@@ -416,9 +416,9 @@ Public Class Pokemon
         End Set
     End Property
 
-    Public Property CatchLocation(Optional saveGame As Boolean = False) As String
+    Public Property CatchLocation() As String
         Get
-            If saveGame = False AndAlso (_catchLocation.StartsWith("<system.token(") AndAlso _catchLocation.EndsWith(")>") OrElse _catchLocation.StartsWith("[system.token(") AndAlso _catchLocation.EndsWith(")]")) Then
+            If _catchLocation.StartsWith("<system.token(") AndAlso _catchLocation.EndsWith(")>") Then
                 Return Localization.GetString(_catchLocation.Remove(_catchLocation.Length - 2, 2).Remove(0, "<system.token(".Length))
             Else
                 Return Me._catchLocation
@@ -429,9 +429,9 @@ Public Class Pokemon
         End Set
     End Property
 
-    Public Property CatchTrainerName(Optional saveGame As Boolean = False) As String
+    Public Property CatchTrainerName() As String
         Get
-            If saveGame = False AndAlso (_catchTrainerName.StartsWith("<system.token(") AndAlso _catchTrainerName.EndsWith(")>") OrElse _catchTrainerName.StartsWith("[system.token(") AndAlso _catchTrainerName.EndsWith(")]")) Then
+            If _catchTrainerName.StartsWith("<system.token(") AndAlso _catchTrainerName.EndsWith(")>") Then
                 Return Localization.GetString(_catchTrainerName.Remove(_catchTrainerName.Length - 2, 2).Remove(0, "<system.token(".Length))
             Else
                 Return Me._catchTrainerName
@@ -442,9 +442,9 @@ Public Class Pokemon
         End Set
     End Property
 
-    Public Property CatchMethod(Optional saveGame As Boolean = False) As String
+    Public Property CatchMethod() As String
         Get
-            If saveGame = False AndAlso (_catchMethod.StartsWith("<system.token(") AndAlso _catchMethod.EndsWith(")>") OrElse _catchMethod.StartsWith("[system.token(") AndAlso _catchMethod.EndsWith(")]")) Then
+            If _catchMethod.StartsWith("<system.token(") AndAlso _catchMethod.EndsWith(")>") Then
                 Return Localization.GetString(_catchMethod.Remove(_catchMethod.Length - 2, 2).Remove(0, "<system.token(".Length))
             Else
                 Return Me._catchMethod
@@ -1973,10 +1973,10 @@ Public Class Pokemon
         "{""Ability""[" & Me.Ability.ID & "]}" &
         "{""Status""[" & SaveStatus & "]}" &
         "{""Nature""[" & Me.Nature & "]}" &
-        "{""CatchLocation""[" & Me.CatchLocation(True) & "]}" &
-        "{""CatchTrainer""[" & Me.CatchTrainerName(True) & "]}" &
+        "{""CatchLocation""[" & Me.CatchLocation & "]}" &
+        "{""CatchTrainer""[" & Me.CatchTrainerName & "]}" &
         "{""CatchBall""[" & Me.CatchBall.ID & "]}" &
-        "{""CatchMethod""[" & Me.CatchMethod(True) & "]}" &
+        "{""CatchMethod""[" & Me.CatchMethod & "]}" &
         "{""Friendship""[" & Me.Friendship & "]}" &
         "{""isShiny""[" & shinyString & "]}" &
         "{""Attack1""[" & A1 & "]}" &
diff --git a/P3D/Screens/Pokemon/SummaryScreen.vb b/P3D/Screens/Pokemon/SummaryScreen.vb
index db7319756..1a232ffb3 100644
--- a/P3D/Screens/Pokemon/SummaryScreen.vb
+++ b/P3D/Screens/Pokemon/SummaryScreen.vb
@@ -413,7 +413,7 @@
                 .CatchLocation = "an unknown place"
             End If
 
-            Dim text As String = .CatchMethod.Replace(.CatchMethod(False)(0), Char.ToUpper(.CatchMethod(False)(0))) & " " & .CatchLocation & "."
+            Dim text As String = .CatchMethod.Replace(.CatchMethod(0), Char.ToUpper(.CatchMethod(0))) & " " & .CatchLocation & "."
 
             SpriteBatch.DrawString(FontManager.MainFont, text.CropStringToWidth(FontManager.MainFont, 1.0F, 300), New Vector2(DeltaX + 358, DeltaY + 336 + 128), New Color(255, 255, 255, CInt(220 * _fadeIn * _pageFade)))