From 560e47175312ee94c8b433898e4ea1afd3b3cf64 Mon Sep 17 00:00:00 2001
From: Kurt <kaphotics@gmail.com>
Date: Sat, 4 Feb 2017 18:28:34 -0800
Subject: [PATCH] Correct japanese text reference

Fetch the language name from PKX instead of grabbing the entire list. ja
!= jp :)
---
 PKHeX/PKM/PK1.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/PKHeX/PKM/PK1.cs b/PKHeX/PKM/PK1.cs
index ed02ae969..b5c693a77 100644
--- a/PKHeX/PKM/PK1.cs
+++ b/PKHeX/PKM/PK1.cs
@@ -340,7 +340,6 @@ public PK7 convertToPK7()
                 Met_Location = 30013, // "Kanto region", hardcoded.
                 Gender = PersonalTable.SM[Species].RandomGender,
                 OT_Name = PKX.getG1ConvertedString(otname, Japanese),
-                Nickname = Util.getSpeciesList(Japanese ? "jp" : "en")[Species],
                 IsNicknamed = false,
 
                 Country = PKMConverter.Country,
@@ -353,6 +352,7 @@ public PK7 convertToPK7()
                 Geo1_Country = PKMConverter.Country,
                 Geo1_Region = PKMConverter.Region
             };
+            pk7.Nickname = PKX.getSpeciesNameGeneration(pk7.Species, pk7.Language, pk7.Format);
             pk7.OT_Friendship = pk7.HT_Friendship = PersonalTable.SM[Species].BaseFriendship;
 
             // IVs