Mirrors/PKHeX
2
0
Fork 0
mirror of https://github.com/kwsch/PKHeX synced 2024-09-21 14:51:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add gen4 ribbon names

Browse source 
Closes #1297
fix off by 1 language checking
This commit is contained in:
Kurt 2017-07-09 14:31:08 -07:00
parent 851809c585
commit 4a2dbe4ad2
11 changed files with 1271 additions and 1077 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
PKHeX.Core/Game/GameInfo.cs
View file

@ -40,8 +40,9 @@ namespace PKHeX.Core
// PKM Info
public readonly string[] specieslist, movelist, itemlist, abilitylist, types, natures, forms,
memories, genloc, trainingbags, trainingstage, characteristics,
encountertypelist, gamelanguages, balllist, gamelist, pokeblocks,
g3coloitems, g3xditems, g3items, g2items, g1items, ribbons;
encountertypelist, gamelanguages, balllist, gamelist, pokeblocks, ribbons;
private readonly string[] mail4, g4items, g3coloitems, g3xditems, g3items, g2items, g1items;
// Met Locations
public readonly string[] metGSC_00000, metRSEFRLG_00000, metCXD_00000;
@ -58,7 +59,7 @@ namespace PKHeX.Core
public GameStrings(string l)
{
lang = l;
ribbons = Get("Ribbons");
ribbons = Get("ribbons");
// Past Generation strings
g3items = Get("ItemsG3");
// XD and Colosseum
@ -121,6 +122,7 @@ namespace PKHeX.Core
puffs = Get("puff");
eggname = specieslist[0];
mail4 = Get("mail4");
metHGSS_00000 = Get("hgss_00000");
metHGSS_02000 = Get("hgss_02000");
metHGSS_03000 = Get("hgss_03000");
@ -138,14 +140,14 @@ namespace PKHeX.Core
metSM_60000 = Get("sm_60000");
Sanitize();
g4items = (string[])itemlist.Clone();
for (int i = 137; i <= 148; i++)
g4items[i] = mail4[i - 137];
}
private void Sanitize()
{
// Gen4 Mail names not stored in future games. No clever solution like for HM's, so improvise.
for (int i = 137; i <= 148; i++)
itemlist[i] = $"Mail #{i - 137 + 1:00} (G4/G5)";
// Fix Item Names (Duplicate entries)
int len = itemlist[425].Length;
itemlist[426] = itemlist[425].Substring(0, len - 1) + (char)(itemlist[425][len - 1] + 1) + " (G4)";
@ -270,6 +272,8 @@ namespace PKHeX.Core
g3itemsEBerry[175] = Legal.EReaderBerryDisplayName;
return g3itemsEBerry;
}
case 4:
return g4items; // mail names changed 4->5
default:
return itemlist;
}

2202
PKHeX.Core/Properties/Resources.Designer.cs generated
View file

File diff suppressed because it is too large Load diff

42
PKHeX.Core/Properties/Resources.resx
View file

@ -1483,34 +1483,52 @@
<data name="flags_pt" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\text\other\flags_pt.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;shift_jis</value>
</data>
<data name="text_Ribbons_de" type="System.Resources.ResXFileRef, System.Windows.Forms">
<data name="text_ribbons_de" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\text\de\text_Ribbons_de.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
</data>
<data name="text_Ribbons_en" type="System.Resources.ResXFileRef, System.Windows.Forms">
<data name="text_ribbons_en" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\text\en\text_Ribbons_en.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
</data>
<data name="text_Ribbons_en1" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\text\en\text_Ribbons_en.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
</data>
<data name="text_Ribbons_es" type="System.Resources.ResXFileRef, System.Windows.Forms">
<data name="text_ribbons_es" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\text\es\text_Ribbons_es.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
</data>
<data name="text_Ribbons_fr" type="System.Resources.ResXFileRef, System.Windows.Forms">
<data name="text_ribbons_fr" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\text\fr\text_Ribbons_fr.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
</data>
<data name="text_Ribbons_it" type="System.Resources.ResXFileRef, System.Windows.Forms">
<data name="text_ribbons_it" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\text\it\text_Ribbons_it.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
</data>
<data name="text_Ribbons_ja" type="System.Resources.ResXFileRef, System.Windows.Forms">
<data name="text_ribbons_ja" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\text\ja\text_Ribbons_ja.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
</data>
<data name="text_Ribbons_ko" type="System.Resources.ResXFileRef, System.Windows.Forms">
<data name="text_ribbons_ko" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\text\ko\text_Ribbons_ko.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
</data>
<data name="text_Ribbons_pt" type="System.Resources.ResXFileRef, System.Windows.Forms">
<data name="text_ribbons_pt" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\text\other\text_Ribbons_pt.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
</data>
<data name="text_Ribbons_zh" type="System.Resources.ResXFileRef, System.Windows.Forms">
<data name="text_ribbons_zh" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\text\zh\text_Ribbons_zh.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
</data>
<data name="text_mail4_de" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\text\de\text_Mail4_de.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
</data>
<data name="text_mail4_en" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\text\en\text_Mail4_en.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
</data>
<data name="text_mail4_es" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\text\es\text_Mail4_es.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
</data>
<data name="text_mail4_fr" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\text\fr\text_Mail4_fr.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
</data>
<data name="text_mail4_it" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\text\it\text_Mail4_it.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
</data>
<data name="text_mail4_ja" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\text\ja\text_Mail4_ja.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
</data>
<data name="text_mail4_ko" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\text\ko\text_Mail4_ko.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
</data>
</root>

12
PKHeX.Core/Resources/text/de/text_Mail4_de.txt Normal file
View file

@ -0,0 +1,12 @@
Wiesenbrief
Feuerbrief
Wasserbrief
Blütenbrief
Minenbrief
Stahlbrief
Rosabrief
Schneebrief
Sternbrief
Luftbrief
Mosaikbrief
Ziegelbrief

12
PKHeX.Core/Resources/text/en/text_Mail4_en.txt Normal file
View file

@ -0,0 +1,12 @@
Grass Mail
Flame Mail
Bubble Mail
Bloom Mail
Tunnel Mail
Steel Mail
Heart Mail
Snow Mail
Space Mail
Air Mail
Mosaic Mail
Brick Mail

12
PKHeX.Core/Resources/text/es/text_Mail4_es.txt Normal file
View file

@ -0,0 +1,12 @@
Grass Mail
Flame Mail
Bubble Mail
Bloom Mail
Tunnel Mail
Steel Mail
Heart Mail
Snow Mail
Space Mail
Air Mail
Mosaic Mail
Brick Mail

12
PKHeX.Core/Resources/text/fr/text_Mail4_fr.txt Normal file
View file

@ -0,0 +1,12 @@
Lettre Herbe
Lettre Feu
Lettre Mer
Lett. Pétale
Lettre Mine
Lettre Acier
Lettre Coeur
Lettre Neige
Lettre Cosmo
Lettre Avion
Lettremosaik
Lettre Brik

12
PKHeX.Core/Resources/text/it/text_Mail4_it.txt Normal file
View file

@ -0,0 +1,12 @@
Mess. Erba
Mess. Fiamma
Mess. Bolla
Mess. Petalo
Mess. Tunnel
Mess. Lega
Mess. Cuore
Mess. Neve
Mess. Spazio
Mess. Aereo
Mess. Iride
Mess. Muro

12
PKHeX.Core/Resources/text/ja/text_Mail4_ja.txt Normal file
View file

@ -0,0 +1,12 @@
グラスメール
フレイムメール
ブルーメール
ブルームメール
トンネルメール
スチールメール
ラブラブメール
ブリザードメール
スペースメール
エアメール
モザイクメール
ブリックメール

12
PKHeX.Core/Resources/text/ko/text_Mail4_ko.txt Normal file
View file

@ -0,0 +1,12 @@
잔디메일
플레임메일
블루메일
블룸메일
터널메일
스틸메일
러브러브메일
블리자드메일
스페이스메일
에어메일
모자이크메일
브릭메일

2
PKHeX.WinForms/Subforms/Save Editors/Gen4/SAV_Pokedex4.cs
View file

@ -284,7 +284,7 @@ namespace PKHeX.WinForms
}
private void ModifyAll(object sender, EventArgs e)
{
int lang = SAV.Language;
int lang = SAV.Language - 1;
if (lang > 5 || lang < 0) // KOR or Invalid
lang = 0;