diff --git a/Data/Actors.rxdata b/Data/Actors.rxdata
index 7967a5432..41edc8e26 100644
Binary files a/Data/Actors.rxdata and b/Data/Actors.rxdata differ
diff --git a/Data/Animations.rxdata b/Data/Animations.rxdata
index aa34e5699..069b904f5 100644
Binary files a/Data/Animations.rxdata and b/Data/Animations.rxdata differ
diff --git a/Data/Armors.rxdata b/Data/Armors.rxdata
index 2249bec14..901f2bb2b 100644
Binary files a/Data/Armors.rxdata and b/Data/Armors.rxdata differ
diff --git a/Data/CommonEvents.rxdata b/Data/CommonEvents.rxdata
index b389ed0e3..65a305717 100644
Binary files a/Data/CommonEvents.rxdata and b/Data/CommonEvents.rxdata differ
diff --git a/Data/Enemies.rxdata b/Data/Enemies.rxdata
index 004ee903d..be622f513 100644
Binary files a/Data/Enemies.rxdata and b/Data/Enemies.rxdata differ
diff --git a/Data/Items.rxdata b/Data/Items.rxdata
index 3e62ba6d2..fe767fa0b 100644
Binary files a/Data/Items.rxdata and b/Data/Items.rxdata differ
diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata
index 52bbad245..0d45016e0 100644
Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ
diff --git a/Data/Scripts/050_AddOns/SpriteCreditsUtils.rb b/Data/Scripts/050_AddOns/SpriteCreditsUtils.rb
index 55a50f1b4..b59e0dbb7 100644
--- a/Data/Scripts/050_AddOns/SpriteCreditsUtils.rb
+++ b/Data/Scripts/050_AddOns/SpriteCreditsUtils.rb
@@ -220,3 +220,37 @@ def format_names_for_game_credits()
   end
   return formatted
 end
+
+def get_spritename_from_path(file_path,includeExtension=false)
+  filename_with_extension = File.basename(file_path)
+  filename_without_extension = File.basename(filename_with_extension, ".*")
+  return filename_with_extension if includeExtension
+  return filename_without_extension
+end
+
+def getSpriterCreditForDexNumber(species_sym)
+  #download sprite to make sure it's in the substitutions map
+  body_id = getBodyID(species_sym)
+  head_id = getHeadID(species_sym,body_id)
+
+  spritePath = get_fusion_sprite_path(head_id,body_id)
+  spritename = get_spritename_from_path(spritePath)
+
+  return getSpriteCredits(spritename)
+end
+
+
+#
+# def getSpriterCreditForPokemon(species_sym)
+#   p species_sym
+#   #download sprite to make sure it's in the substitutions map
+#   head_id = get_head_id_from_symbol(species_sym)
+#   body_id = get_body_id_from_symbol(species_sym)
+#
+#   echoln head_id
+#   echoln body_id
+#   spritename = get_fusion_sprite_path(head_id,body_id)
+#   p spritename
+#   p getSpriteCredits(spritename)
+#   return getSpriteCredits(spritename)
+# end
\ No newline at end of file
diff --git a/Data/Scripts/050_AddOns/Wondertrade.rb b/Data/Scripts/050_AddOns/Wondertrade.rb
index a143aff96..8a5edcb5b 100644
--- a/Data/Scripts/050_AddOns/Wondertrade.rb
+++ b/Data/Scripts/050_AddOns/Wondertrade.rb
@@ -116,7 +116,7 @@ def pbWonderTrade(lvl, except = [], except2 = [], premiumWonderTrade = true)
       end
     end
     randTrainerNames = RandTrainerNames_male + RandTrainerNames_female + RandTrainerNames_others
-    tname = randTrainerNames[rand(randTrainerNames.size)] # Randomizes Trainer Names
+    #tname = randTrainerNames[rand(randTrainerNames.size)] # Randomizes Trainer Names
     pname = RandPokeNick[rand(RandPokeNick.size)] # Randomizes Pokemon Nicknames
 
     #num of Wondertrade - 1
@@ -125,7 +125,8 @@ def pbWonderTrade(lvl, except = [], except2 = [], premiumWonderTrade = true)
     else
       $game_variables[VAR_STANDARD_WONDERTRADE_LEFT] -= 1
     end
-
+    tname = getSpriterCreditForDexNumber(species)
+    tname = randTrainerNames[rand(randTrainerNames.size)] if ! tname
     newpoke = pbStartTrade(pbGet(1), species, pname, tname, 0, true) # Starts the trade
     #lower level by 1 to prevent abuse
     if poke.level > 25
diff --git a/Data/Skills.rxdata b/Data/Skills.rxdata
index 61cba7ea2..a45219f5e 100644
Binary files a/Data/Skills.rxdata and b/Data/Skills.rxdata differ
diff --git a/Data/States.rxdata b/Data/States.rxdata
index 0f9b4ae5d..868d49e59 100644
Binary files a/Data/States.rxdata and b/Data/States.rxdata differ
diff --git a/Data/System.rxdata b/Data/System.rxdata
index e99b5c929..c7a94ce93 100644
Binary files a/Data/System.rxdata and b/Data/System.rxdata differ
diff --git a/Data/Tilesets.rxdata b/Data/Tilesets.rxdata
index 05045e8ca..646a60fd7 100644
Binary files a/Data/Tilesets.rxdata and b/Data/Tilesets.rxdata differ
diff --git a/Data/Weapons.rxdata b/Data/Weapons.rxdata
index d9bd35260..c7ea19a7a 100644
Binary files a/Data/Weapons.rxdata and b/Data/Weapons.rxdata differ