diff --git a/P3D/Network/GameJolt/GTS/GTSTradeScreen.vb b/P3D/Network/GameJolt/GTS/GTSTradeScreen.vb
index f02a941d3..4bd20dc41 100644
--- a/P3D/Network/GameJolt/GTS/GTSTradeScreen.vb
+++ b/P3D/Network/GameJolt/GTS/GTSTradeScreen.vb
@@ -447,7 +447,7 @@
                             P2Pos.Y -= 2
 
                             If P1Pos.Y >= Core.windowSize.Height And P2Pos.Y <= -160 Then
-                                If D.Pokemon.CanEvolve(EvolutionCondition.EvolutionTrigger.Trading, "") = True Then
+                                If D.Pokemon.CanEvolve(EvolutionCondition.EvolutionTrigger.Trading, P.Number.ToString) = True Then
                                     Core.SetScreen(New EvolutionScreen(Me, {Core.Player.Pokemons.Count - 1}.ToList(), P.Number.ToString(), EvolutionCondition.EvolutionTrigger.Trading))
                                 End If
                                 state = 3
diff --git a/P3D/Network/GameJolt/GTS/WonderTradeScreen.vb b/P3D/Network/GameJolt/GTS/WonderTradeScreen.vb
index e65084634..c71df27f6 100644
--- a/P3D/Network/GameJolt/GTS/WonderTradeScreen.vb
+++ b/P3D/Network/GameJolt/GTS/WonderTradeScreen.vb
@@ -411,7 +411,8 @@
 
             MusicManager.Play("gts", True)
 
-            If Core.Player.Pokemons(Core.Player.Pokemons.Count - 1).CanEvolve(EvolutionCondition.EvolutionTrigger.Trading, "") = True Then
+            Dim p As Pokemon = Core.Player.Pokemons(Core.Player.Pokemons.Count - 1)
+            If p.CanEvolve(EvolutionCondition.EvolutionTrigger.Trading, SelectedPokemon.Number.ToString) Then
                 Core.SetScreen(New EvolutionScreen(Me, {Core.Player.Pokemons.Count - 1}.ToList(), Me.SelectedPokemon.Number.ToString(), EvolutionCondition.EvolutionTrigger.Trading))
             End If
 
diff --git a/P3D/Network/Servers/DirectTradeScreen.vb b/P3D/Network/Servers/DirectTradeScreen.vb
index 03f0cb0b2..8a8ffbba6 100644
--- a/P3D/Network/Servers/DirectTradeScreen.vb
+++ b/P3D/Network/Servers/DirectTradeScreen.vb
@@ -517,7 +517,8 @@
 
         MusicManager.Play("gts", True)
 
-        If Core.Player.Pokemons(Core.Player.Pokemons.Count - 1).CanEvolve(EvolutionCondition.EvolutionTrigger.Trading, "") = True Then
+        Dim p As Pokemon = Core.Player.Pokemons(Core.Player.Pokemons.Count - 1)
+        If p.CanEvolve(EvolutionCondition.EvolutionTrigger.Trading, offeredPokemonID.ToString) Then
             Core.SetScreen(New EvolutionScreen(Me, {Core.Player.Pokemons.Count - 1}.ToList(), offeredPokemonID.ToString(), EvolutionCondition.EvolutionTrigger.Trading))
         End If
         Me.CanChat = True
diff --git a/P3D/Screens/MainMenu/NewNewGameScreen.vb b/P3D/Screens/MainMenu/NewNewGameScreen.vb
index 7ee5c8456..f4b0b6a75 100644
--- a/P3D/Screens/MainMenu/NewNewGameScreen.vb
+++ b/P3D/Screens/MainMenu/NewNewGameScreen.vb
@@ -149,8 +149,52 @@
             Core.Player.startRiding = False
             Core.Player.startRotation = CSng(MathHelper.Pi * (rot / 2))
 
+            Core.Player.BerryData = CreateBerryData()
+            Core.Player.AddVisitedMap("yourroom.dat")
+            Core.Player.SaveCreated = GameController.GAMEDEVELOPMENTSTAGE & " " & GameController.GAMEVERSION
+            Core.Player.RivalName = "???"
+
+
+            Dim ot As String = Core.Random.Next(0, 999999).ToString()
+            While ot.Length < 6
+                ot = "0" & ot
+            End While
+            Core.Player.OT = ot
         End Sub
 
+        Private Shared Function CreateBerryData() As String
+            Dim s As String = "{route29.dat|13,0,5|6|2|0|2012,9,21,4,0,0|1}" & Environment.NewLine &
+            "{route29.dat|14,0,5|6|2|0|2012,9,21,4,0,0|1}" & Environment.NewLine &
+            "{route29.dat|15,0,5|6|2|0|2012,9,21,4,0,0|1}" & Environment.NewLine &
+            "{azalea.dat|9,0,3|0|2|0|2012,9,21,4,0,0|1}" & Environment.NewLine &
+            "{azalea.dat|9,0,4|1|1|0|2012,9,21,4,0,0|1}" & Environment.NewLine &
+            "{azalea.dat|9,0,5|0|2|0|2012,9,21,4,0,0|1}" & Environment.NewLine &
+            "{route30.dat|7,0,41|10|1|0|2012,9,21,4,0,0|1}" & Environment.NewLine &
+            "{route30.dat|14,0,5|2|1|0|2012,9,21,4,0,0|1}" & Environment.NewLine &
+            "{route30.dat|15,0,5|6|2|0|2012,9,21,4,0,0|1}" & Environment.NewLine &
+            "{route30.dat|16,0,5|2|1|0|2012,9,21,4,0,0|1}" & Environment.NewLine &
+            "{routes\route35.dat|0,0,4|7|2|0|2012,9,21,4,0,0|1}" & Environment.NewLine &
+            "{routes\route35.dat|1,0,4|8|2|0|2012,9,21,4,0,0|1}" & Environment.NewLine &
+            "{route36.dat|37,0,7|0|1|0|2012,9,21,4,0,0|1}" & Environment.NewLine &
+            "{route36.dat|38,0,7|4|1|0|2012,9,21,4,0,0|1}" & Environment.NewLine &
+            "{route36.dat|39,0,7|3|2|0|2012,9,21,4,0,0|1}" & Environment.NewLine &
+            "{route39.dat|8,0,2|9|1|0|2012,9,21,4,0,0|1}" & Environment.NewLine &
+            "{route39.dat|8,0,3|6|1|0|2012,9,21,4,0,0|1}" & Environment.NewLine &
+            "{route38.dat|13,0,12|16|2|0|2012,9,21,4,0,0|1}" & Environment.NewLine &
+            "{route38.dat|14,0,12|23|1|0|2012,9,21,4,0,0|1}" & Environment.NewLine &
+            "{route38.dat|15,0,12|16|2|0|2012,9,21,4,0,0|1}" & Environment.NewLine &
+            "{routes\route43.dat|13,0,45|23|2|0|2012,9,21,4,0,0|1}" & Environment.NewLine &
+            "{routes\route43.dat|13,0,46|24|2|0|2012,9,21,4,0,0|1}" & Environment.NewLine &
+            "{routes\route43.dat|13,0,47|25|2|0|2012,9,21,4,0,0|1}" & Environment.NewLine &
+            "{safarizone\main.dat|3,0,11|5|2|0|2012,9,21,4,0,0|1}" & Environment.NewLine &
+            "{safarizone\main.dat|4,0,11|0|2|0|2012,9,21,4,0,0|1}" & Environment.NewLine &
+            "{safarizone\main.dat|5,0,11|6|3|0|2012,9,21,4,0,0|1}"
+
+            Return s
+        End Function
+
+
+
         ''' <summary>
         ''' A screen used to select from a range of skins.
         ''' </summary>
diff --git a/lib/build/Pokemon3D.exe b/lib/build/Pokemon3D.exe
index 0c440e716..4395b244a 100644
Binary files a/lib/build/Pokemon3D.exe and b/lib/build/Pokemon3D.exe differ