non custom finals export + random changes

Data/Scripts/050_AddOns/FusionSprites.rb

@@ -165,7 +165,7 @@ module GameData
       customPath = pbResolveBitmap(Settings::CUSTOM_BATTLERS_FOLDER + filename)
       species = getSpecies(dex_number)
       use_custom = customPath && !species.always_use_generated
-      if use_custom
+      if use_custom && dex_number > Settings::NB_POKEMON
         return customPath
       end
       return Settings::BATTLERS_FOLDER + folder + "/" + filename

Data/Scripts/050_AddOns/WonderTrade_names.rb

@@ -198,6 +198,12 @@ RandPokeNick = [
   "Skyrim",
   "Zeffy",
   "Hydra",
+  "Lil' Wayne",
+  "Drake",
+  "Jay-Z",
+  "50 Cent",
+  "Kanye",
+  "Nicki",
   "Ultimo!",
   "Sohcahtoa",
   "The Beast",
@@ -468,6 +474,7 @@ RandPokeNick = [
   "Twitter",
   "Facebook",
   "Mia",
+  "miam",
   "Lame-o",
   "Snoop",
   "Mephesto",
@@ -538,6 +545,7 @@ RandPokeNick = [
   "Sniper",
   "Suzy",
   "Lucy",
+  "Mike",
   "Molly",
   "Leela",
   "Pauvcon",