From dab71b95f7a72f368eee7436af5bb68d8f19c03d Mon Sep 17 00:00:00 2001
From: JappaWakka <jjlspeelman@outlook.com>
Date: Fri, 28 Mar 2025 14:32:03 +0100
Subject: [PATCH] Some better catchmethod and catchlocation grabbing

---
 P3D/Content/Localization/Tokens_de.dat   | 1 +
 P3D/Content/Localization/Tokens_en.dat   | 1 +
 P3D/Content/Localization/Tokens_es.dat   | 1 +
 P3D/Content/Localization/Tokens_fr.dat   | 1 +
 P3D/Content/Localization/Tokens_nl.dat   | 1 +
 P3D/Content/Localization/Tokens_pl.dat   | 1 +
 P3D/Content/Localization/Tokens_ptbr.dat | 1 +
 P3D/Pokemon/Monster/Pokemon.vb           | 4 +---
 P3D/Pokemon/Monster/Shedinja.vb          | 4 ++--
 9 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/P3D/Content/Localization/Tokens_de.dat b/P3D/Content/Localization/Tokens_de.dat
index 59ed0175b..cd859efe5 100644
--- a/P3D/Content/Localization/Tokens_de.dat
+++ b/P3D/Content/Localization/Tokens_de.dat
@@ -120,6 +120,7 @@ Catch Method & Location:
 CatchMethod_Empty,Somehow obtained at
 CatchMethod_Caught,Caught at
 CatchMethod_Obtained,Obtained at
+CatchMethod_Appeared,Appeared at
 
 CatchLocation_Empty,an unknown place
 ---
diff --git a/P3D/Content/Localization/Tokens_en.dat b/P3D/Content/Localization/Tokens_en.dat
index 8c39b10f5..1fd9cdc5e 100644
--- a/P3D/Content/Localization/Tokens_en.dat
+++ b/P3D/Content/Localization/Tokens_en.dat
@@ -121,6 +121,7 @@ Catch Method & Location:
 CatchMethod_Empty,Somehow obtained at
 CatchMethod_Caught,Caught at
 CatchMethod_Obtained,Obtained at
+CatchMethod_Appeared,Appeared at
 
 CatchLocation_Empty,an unknown place
 ---
diff --git a/P3D/Content/Localization/Tokens_es.dat b/P3D/Content/Localization/Tokens_es.dat
index e940f9712..44aa475d0 100644
--- a/P3D/Content/Localization/Tokens_es.dat
+++ b/P3D/Content/Localization/Tokens_es.dat
@@ -121,6 +121,7 @@ Catch Method & Location:
 CatchMethod_Empty,Somehow obtained at
 CatchMethod_Caught,Caught at
 CatchMethod_Obtained,Obtained at
+CatchMethod_Appeared,Appeared at
 
 CatchLocation_Empty,an unknown place
 ---
diff --git a/P3D/Content/Localization/Tokens_fr.dat b/P3D/Content/Localization/Tokens_fr.dat
index ead1b4e9f..2af019e2d 100644
--- a/P3D/Content/Localization/Tokens_fr.dat
+++ b/P3D/Content/Localization/Tokens_fr.dat
@@ -119,6 +119,7 @@ Catch Method & Location:
 CatchMethod_Empty,Somehow obtained at
 CatchMethod_Caught,Caught at
 CatchMethod_Obtained,Obtained at
+CatchMethod_Appeared,Appeared at
 
 CatchLocation_Empty,an unknown place
 ---
diff --git a/P3D/Content/Localization/Tokens_nl.dat b/P3D/Content/Localization/Tokens_nl.dat
index 95b9c6290..4dd1e1433 100644
--- a/P3D/Content/Localization/Tokens_nl.dat
+++ b/P3D/Content/Localization/Tokens_nl.dat
@@ -120,6 +120,7 @@ Catch Method & Location:
 CatchMethod_Empty,Zomaar ontvangen bij
 CatchMethod_Caught,Gevangen bij
 CatchMethod_Obtained,Ontvangen bij
+CatchMethod_Appeared,Verschenen bij
 
 CatchLocation_Empty,een onbekende plek
 ---
diff --git a/P3D/Content/Localization/Tokens_pl.dat b/P3D/Content/Localization/Tokens_pl.dat
index 664049807..76c6b0f59 100644
--- a/P3D/Content/Localization/Tokens_pl.dat
+++ b/P3D/Content/Localization/Tokens_pl.dat
@@ -121,6 +121,7 @@ Catch Method & Location:
 CatchMethod_Empty,Jakoś otrzymano w:
 CatchMethod_Caught,Złapano w:
 CatchMethod_Obtained,Otrzymano w:
+CatchMethod_Appeared,Appeared at
 
 CatchLocation_Empty,nieznanym miejscu
 ---
diff --git a/P3D/Content/Localization/Tokens_ptbr.dat b/P3D/Content/Localization/Tokens_ptbr.dat
index 8952de1c8..7980055c4 100644
--- a/P3D/Content/Localization/Tokens_ptbr.dat
+++ b/P3D/Content/Localization/Tokens_ptbr.dat
@@ -119,6 +119,7 @@ Catch Method & Location:
 CatchMethod_Empty,Somehow obtained at
 CatchMethod_Caught,Caught at
 CatchMethod_Obtained,Obtained at
+CatchMethod_Appeared,Appeared at
 
 CatchLocation_Empty,an unknown place
 ---
diff --git a/P3D/Pokemon/Monster/Pokemon.vb b/P3D/Pokemon/Monster/Pokemon.vb
index bddba4ae3..59dbd3367 100644
--- a/P3D/Pokemon/Monster/Pokemon.vb
+++ b/P3D/Pokemon/Monster/Pokemon.vb
@@ -420,8 +420,6 @@ Public Class Pokemon
         Get
             If _catchLocation.StartsWith("<system.token(") AndAlso _catchLocation.EndsWith(")>") Then
                 Return Localization.GetString(_catchLocation.Remove(_catchLocation.Length - 2, 2).Remove(0, "<system.token(".Length))
-            ElseIf Localization.TokenExists(Localization.GetString("Places_" & _catchLocation, _catchLocation)) Then
-                Return Localization.GetString("Places_" & _catchLocation, _catchLocation)
             Else
                 Return Me._catchLocation
             End If
@@ -2846,7 +2844,7 @@ Public Class Pokemon
     ''' <param name="Ball">The Pokéball this Pokémon got captured in.</param>
     ''' <param name="Method">The capture method.</param>
     Public Sub SetCatchInfos(ByVal Ball As Item, ByVal Method As String)
-        Me.CatchLocation = Screen.Level.MapName
+        Me.CatchLocation = Localization.GetString("Places_" & Screen.Level.MapName, Screen.Level.MapName)
         Me.CatchTrainerName = Core.Player.Name
         Me.OT = Core.Player.OT
 
diff --git a/P3D/Pokemon/Monster/Shedinja.vb b/P3D/Pokemon/Monster/Shedinja.vb
index 8e1bf1c4e..d50801968 100644
--- a/P3D/Pokemon/Monster/Shedinja.vb
+++ b/P3D/Pokemon/Monster/Shedinja.vb
@@ -31,8 +31,8 @@ Public Class Shedinja
         'Set base infos:
         p.OT = Ninjask.OT
         p.CatchTrainerName = Ninjask.CatchTrainerName
-        p.CatchMethod = "appeared at"
-        p.CatchLocation = Screen.Level.MapName
+        p.CatchMethod = Localization.GetString("CatchMethod_Appeared", "Appeared at")
+        p.CatchLocation = Localization.GetString("Places_" & Screen.Level.MapName, Screen.Level.MapName)
         p.IsShiny = Ninjask.IsShiny
         p.Nature = Ninjask.Nature