diff --git a/P3D/World/ActionScript/V2/ScriptCommands/DoPokemon.vb b/P3D/World/ActionScript/V2/ScriptCommands/DoPokemon.vb index 8f6050b18..9e65dcd19 100644 --- a/P3D/World/ActionScript/V2/ScriptCommands/DoPokemon.vb +++ b/P3D/World/ActionScript/V2/ScriptCommands/DoPokemon.vb @@ -58,7 +58,11 @@ Dim catchMethod As String = "random reason" If commas > 1 Then - catchMethod = argument.GetSplit(2) + Dim catchMethodLocalization As String = argument.GetSplit(2) + If argument.GetSplit(2).StartsWith("") Then + catchMethodLocalization = Localization.GetString(catchMethodLocalization.Remove(0, " 3 Then - catchLocation = argument.GetSplit(4) + Dim catchLocationLocalization As String = argument.GetSplit(4) + If argument.GetSplit(4).StartsWith("") Then + catchLocationLocalization = Localization.GetString(catchLocationLocalization.Remove(0, "") Then + methodLocalization = Localization.GetString(methodLocalization.Remove(0, "= Index Then - Core.Player.Pokemons(Index).CatchMethod = method + Core.Player.Pokemons(Index).CatchMethod = methodLocalization End If Case "setcatchplace", "setcatchlocation" Dim Index As Integer = int(argument.GetSplit(0, ",")) - Dim place As String = argument.GetSplit(1, ",") + Dim placeLocalization As String = argument.GetSplit(1, ",") + + If argument.GetSplit(1, ",").StartsWith("") Then + placeLocalization = Localization.GetString(placeLocalization.Remove(0, "= Index Then - Core.Player.Pokemons(Index).CatchLocation = place + Core.Player.Pokemons(Index).CatchLocation = placeLocalization End If Case "newroaming" ' PokémonID,Level,regionID,startLevelFile,MusicLoop,[Shiny] @@ -761,7 +777,11 @@ Dim catchMethod As String = "random reason" If commas > 1 Then - catchMethod = argument.GetSplit(2) + Dim catchMethodLocalization As String = argument.GetSplit(2) + If argument.GetSplit(2).StartsWith("") Then + catchMethodLocalization = Localization.GetString(catchMethodLocalization.Remove(0, " 3 Then - catchLocation = argument.GetSplit(4) + Dim catchLocationLocalization As String = argument.GetSplit(4) + If argument.GetSplit(4).StartsWith("") Then + catchLocationLocalization = Localization.GetString(catchLocationLocalization.Remove(0, "