Misc tweaks

Adds game names for languages other than english
adds z crystal sprites for held items
temp-fixes chinese pkm names (need manual translation for the new
species)
remove newline at eof
toggle back on legal item lists, add assumed Key Item list
differentiate duplicate item name strings (-arizers)
This commit is contained in:
Kurt 2017-11-08 13:06:20 -08:00
parent f825377e83
commit 80bedb97c4
90 changed files with 1794 additions and 1708 deletions

View file

@ -183,6 +183,8 @@ namespace PKHeX.Core
itemlist[771] += " (3)"; // Meteorite
itemlist[772] += " (4)"; // Meteorite
itemlist[842] += " (SM)"; // Fishing Rod
itemlist[945] += " (2)"; // Used Solarizer
itemlist[946] += " (2)"; // Used Lunarizer
// Append Z-Crystal flagging
foreach (var i in Legal.Pouch_ZCrystal_USUM)

View file

@ -12,10 +12,10 @@ namespace PKHeX.Core
internal const int MaxBallID_7 = 0x1A; // 26
internal const int MaxGameID_7 = 41; // Crystal (VC?)
internal const int MaxSpeciesID_7_USUM = 807; // 807 todo
internal const int MaxMoveID_7_USUM = 728; // 728 todo
internal const int MaxItemID_7_USUM = 959; // 959 todo
internal const int MaxAbilityID_7_USUM = 233; // 233 todo
internal const int MaxSpeciesID_7_USUM = 807;
internal const int MaxMoveID_7_USUM = 728;
internal const int MaxItemID_7_USUM = 959;
internal const int MaxAbilityID_7_USUM = 233;
#region Met Locations
@ -93,11 +93,11 @@ namespace PKHeX.Core
705, 706, 765, 773, 797,
841, 842, 843, 845, 847, 850, 857, 858, 860,
};
internal static readonly ushort[] Pouch_Key_USUM = {
// todo
};
internal static readonly ushort[] Pouch_Key_USUM = Pouch_Key_SM.Concat(new ushort[] {
933, 934, 935, 936, 937, 938, 939, 940, 941, 942, 943, 944, 945, 946, 947, 948
}).ToArray();
internal static readonly ushort[] Pouch_Roto_USUM = {
//949, 950, 951, 952, 953, 954, 955, 956, 957, 958, 959
949, 950, 951, 952, 953, 954, 955, 956, 957, 958, 959
};
internal static readonly ushort[] Pouch_TMHM_SM = { // 02
328, 329, 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, 344, 345,
@ -123,16 +123,16 @@ namespace PKHeX.Core
776, 777, 778, 779, 780, 781, 782, 783, 784, 785, 786, 787, 788, 789, 790, 791, 792, 793, 794, 798, 799, 800, 801, 802, 803, 804, 805, 806, 836
};
internal static readonly ushort[] Pouch_ZCrystal_USUM = Pouch_ZCrystal_SM.Concat(new ushort[] { // Bead
//927, 928, 929, 930, 931, 932
927, 928, 929, 930, 931, 932
}).ToArray();
internal static readonly ushort[] Pouch_ZCrystalHeld_USUM = Pouch_ZCrystalHeld_SM.Concat(new ushort[] { // Piece
//921, 922, 923, 924, 925, 926
921, 922, 923, 924, 925, 926
}).ToArray();
public static readonly Dictionary<int, int> ZCrystalDictionary = Pouch_ZCrystal_USUM
.Zip(Pouch_ZCrystalHeld_USUM, (k, v) => new { Key = (int)k, Value = (int)v })
.ToDictionary(x => x.Key, x => x.Value);
internal static readonly ushort[] HeldItems_SM = new ushort[1].Concat(Pouch_Items_SM).Concat(Pouch_Berries_SM).Concat(Pouch_Medicine_SM).Concat(Pouch_ZCrystalHeld_SM).ToArray();
internal static readonly ushort[] HeldItems_USUM = HeldItems_SM; // todo
internal static readonly ushort[] HeldItems_USUM = new ushort[1].Concat(Pouch_Items_SM).Concat(Pouch_Berries_SM).Concat(Pouch_Medicine_SM).Concat(Pouch_ZCrystalHeld_USUM).ToArray();
private static readonly HashSet<int> WildPokeballs7 = new HashSet<int> {
0x01, 0x02, 0x03, 0x04, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,

View file

@ -231,4 +231,4 @@ Gras-Erzeuger
Metallprotektor
Phantomschutz
Prismarüstung
Zerebralmacht
Zerebralmacht

View file

@ -30,8 +30,8 @@ Omega Rubin
Sonne
Mond
Ultrasonne
Ultramond
GO
Rote
Blaue [INT]/Grüne [JP]

View file

@ -1,4 +1,4 @@
Kein Item
Kein
Meisterball
Hyperball
Superball
@ -957,4 +957,4 @@ Schutzbon
KP-Bon
AP-Bon
Statuswertebon
Fangbon
Fangbon

View file

@ -726,4 +726,4 @@ Schmetternde Sonnenwalze
Geballter Mondlaser
Herzliche Knuddelkloppe
Fataler Steinregen
Rasselnder Seelentanz
Rasselnder Seelentanz

View file

@ -805,4 +805,4 @@ Venicro
Agoyon
Muramura
Kopplosio
Zeraora
Zeraora

View file

@ -230,4 +230,4 @@ Pikachu-Tal
Route 1
Trainerschule
Spaltberg-Tunnel
Spaltberg-Tunnel

View file

@ -14,4 +14,4 @@ Kanto-Region
Hoenn-Region
Alola-Region
Pokémon-Resort
Johto-Region
Johto-Region

View file

@ -85,4 +85,4 @@ Pokémon GO
Pokémon Bank
Pokémon-Geschäft
Demo-Version
Pokémon Trainer Club
Pokémon Trainer Club

View file

@ -1,4 +1,4 @@
Ferne Person
Hortleiterinnen
Schatzsucher
Dame der Heißen Quellen
Dame der Heißen Quellen

View file

@ -231,4 +231,4 @@ Grassy Surge
Full Metal Body
Shadow Shield
Prism Armor
Neuroforce
Neuroforce

View file

@ -957,4 +957,4 @@ Roto Stealth
Roto HP Restore
Roto PP Restore
Roto Boost
Roto Catch
Roto Catch

View file

@ -726,4 +726,4 @@ Searing Sunraze Smash
Menacing Moonraze Maelstrom
Lets Snuggle Forever
Splintered Stormshards
Clangorous Soulblaze
Clangorous Soulblaze

View file

@ -805,4 +805,4 @@ Poipole
Naganadel
Stakataka
Blacephalon
Zeraora
Zeraora

View file

@ -230,4 +230,4 @@ Pikachu Valley
Route 1
Trainers School
Dividing Peak Tunnel
Dividing Peak Tunnel

View file

@ -14,4 +14,4 @@ the Kanto region
the Hoenn region
the Alola region
Poké Pelago
the Johto region
the Johto region

View file

@ -85,4 +85,4 @@ Pokémon GO
Pokémon Bank
a Pokémon shop
a demo version
the Pokémon Trainer Club
the Pokémon Trainer Club

View file

@ -1,4 +1,4 @@
a stranger
Nursery helpers
a treasure hunter
an old hot-springs visitor
an old hot-springs visitor

View file

@ -231,4 +231,4 @@ Herbogénesis
Guardia Metálica
Guardia Espectro
Armadura Prisma
Fuerza Cerebral
Fuerza Cerebral

View file

@ -30,8 +30,8 @@ Rubí Omega
Sol
Luna
Ultrasol
Ultraluna
GO
Roja
Azul [INT]/Verde [JP]

View file

@ -1,4 +1,4 @@
Ningún objeto
Ningún
Master Ball
Ultra Ball
Super Ball
@ -957,4 +957,4 @@ Cupón Sigilo
Cupón PS
Cupón PP
Cupón Refuerzo
Cupón Captura
Cupón Captura

View file

@ -726,4 +726,4 @@ Embestida Solar
Deflagración Lunar
Somanta Amistosa
Tempestad Rocosa
Estruendo Implacable
Estruendo Implacable

View file

@ -805,4 +805,4 @@ Poipole
Naganadel
Stakataka
Blacephalon
Zeraora
Zeraora

View file

@ -230,4 +230,4 @@ Valle de los Pikachu
Ruta 1
Escuela Entrenadores
Túnel del Volcán
Túnel del Volcán

View file

@ -14,4 +14,4 @@ Kanto
Hoenn
Alola
Poké Resort
Johto
Johto

View file

@ -85,4 +85,4 @@ Pokémon GO
Banco de Pokémon
Establecimiento Pokémon
versión de prueba
Club de Entrenadores Pokémon
Club de Entrenadores Pokémon

View file

@ -1,4 +1,4 @@
Persona lejana
Cuidados Pokémon
Buscatesoros
Anciana del Balneario
Anciana del Balneario

View file

@ -231,4 +231,4 @@ Créa-Herbe
Métallo-Garde
Spectro-Bouclier
Prisme-Armure
Cérébro-Force
Cérébro-Force

View file

@ -30,8 +30,8 @@ Rubis Oméga
Soleil
Lune
Ultra-Soleil
Ultra-Lune
GO
Rouge
Bleue [INT]/Vert [JP]

View file

@ -1,4 +1,4 @@
Aucun objet
Aucun
Master Ball
Hyper Ball
Super Ball
@ -957,4 +957,4 @@ Moti-Camouflage
Moti-Récup PV
Moti-Récup PP
Moti-Soutien
Moti-Capture
Moti-Capture

View file

@ -726,4 +726,4 @@ Hélio-Choc Dévastateur
Rayons Séléno-Explosifs
Patati-Patattrape
Hurlement des Roches-Lames
Dracacophonie Flamboyante
Dracacophonie Flamboyante

View file

@ -805,4 +805,4 @@ Vémini
Mandrillon
Ama-Ama
Pierroteknik
Zeraora
Zeraora

View file

@ -230,4 +230,4 @@ Plaine des Pikachu
Route 1
École de Dresseurs
Tunnel Perce-Mont
Tunnel Perce-Mont

View file

@ -14,4 +14,4 @@ Kanto
Hoenn
Alola
Poké Loisir
Johto
Johto

View file

@ -85,4 +85,4 @@ Pokémon GO
Banque Pokémon
Boutique Pokémon
Démo
Club des Dresseurs Pokémon
Club des Dresseurs Pokémon

View file

@ -1,4 +1,4 @@
Personne lointaine
Responsable de la Garderie
Chercheur de Trésors
Dame des Eaux Thermales
Dame des Eaux Thermales

View file

@ -231,4 +231,4 @@ Erbogenesi
Metalprotezione
Spettroguardia
Scudoprisma
Cerebroforza
Cerebroforza

View file

@ -30,8 +30,8 @@ Rubino Omega
Sole
Luna
Ultrasole
Ultraluna
GO
Rossa
Blu [INT]/Verde [JP]

View file

@ -957,4 +957,4 @@ Repellenroll
PSnroll
PPnroll
Statnroll
Acchiappanroll
Acchiappanroll

View file

@ -726,4 +726,4 @@ Supercollisione Solare
Deflagrazione Lunare
Dolcesacco di Botte
Litotempesta Radiale
Dracofonia Divampante
Dracofonia Divampante

View file

@ -805,4 +805,4 @@ Poipole
Naganadel
Stakataka
Blacephalon
Zeraora
Zeraora

View file

@ -230,4 +230,4 @@ Valle dei Pikachu
Percorso 1
Scuola Allenatori
Tunnel del Vulcano
Tunnel del Vulcano

View file

@ -14,4 +14,4 @@ Kanto
Hoenn
Alola
Poké Resort
Johto
Johto

View file

@ -85,4 +85,4 @@ Pokémon GO
Banca Pokémon
Negozio Pokémon
Demo
Club Allenatori di Pokémon
Club Allenatori di Pokémon

View file

@ -1,4 +1,4 @@
Persona lontana
Ostello Pokémon
Cercatesori
Vecchina delle terme
Vecchina delle terme

View file

@ -231,4 +231,4 @@
メタルプロテクト
ファントムガード
プリズムアーマー
ブレインフォース
ブレインフォース

View file

@ -30,8 +30,8 @@ Y
サン
ムーン
ウルトラサン
ウルトラムーン
GO
青 [INT]/緑 [JP]

View file

@ -957,4 +957,4 @@
HPかいふくポン
PPかいふくポン
おうえんポン
つかまえポン
つかまえポン

View file

@ -726,4 +726,4 @@
ムーンライトブラスター
ぽかぼかフレンドタイム
ラジアルエッジストーム
ブレイジングソウルビート
ブレイジングソウルビート

View file

@ -805,4 +805,4 @@
アーゴヨン
ツンデツンデ
ズガドーン
ゼラオラ
ゼラオラ

View file

@ -230,4 +230,4 @@
1ばんどうろ
トレーナーズスクール
ワカツダケトンネル
ワカツダケトンネル

View file

@ -14,4 +14,4 @@ Pokémon GO
ホウエンちほう
アローラちほう
ポケリゾート
ジョウトちほう
ジョウトちほう

View file

@ -85,4 +85,4 @@ Pokémon GO
ポケモンバンク
ポケモンのショップ
たいけんばん
the Pokémon Trainer Club
the Pokémon Trainer Club

View file

@ -1,4 +1,4 @@
とおくにいるひと
あずかりやさん
トレジャーハンター
おんせんばあさん
おんせんばあさん

View file

@ -231,4 +231,4 @@ AR시스템
메탈프로텍트
스펙터가드
프리즘아머
브레인포스
브레인포스

View file

@ -30,8 +30,8 @@ Y
울트라썬
울트라문
레드
블루 [INT]/그린 [JP]

View file

@ -957,4 +957,4 @@ Z파워링
HP회복캡슐토이
PP회복캡슐토이
응원캡슐토이
잡기캡슐토이
잡기캡슐토이

View file

@ -726,4 +726,4 @@ DD래리어트
문라이트블래스터
투닥투닥프렌드타임
레이디얼에지스톰
브레이징소울비트
브레이징소울비트

View file

@ -805,4 +805,4 @@
아고용
차곡차곡
두파팡
제라오라
제라오라

View file

@ -230,4 +230,4 @@
1번도로
트레이너스쿨
경계터널
경계터널

View file

@ -14,4 +14,4 @@ Pokémon GO
호연지방
알로라지방
포켓리조트
성도지방
성도지방

View file

@ -85,4 +85,4 @@ Pokémon GO
포켓몬 뱅크
a Pokémon shop
체험판
the Pokémon Trainer Club
the Pokémon Trainer Club

View file

@ -1,4 +1,4 @@
멀리 있는 사람
맡기미집
트레져헌터
온천할머니
온천할머니

View file

@ -231,4 +231,4 @@
金属防护
幻影防守
棱镜装甲
脑核之力
脑核之力

View file

@ -30,8 +30,8 @@ Y
太阳
月亮
究極之日
究極之月
GO
蓝 [国际]/绿 [日]

View file

@ -957,4 +957,4 @@
HP回复碰碰
PP回复碰碰
加油碰碰
捕捉碰碰
捕捉碰碰

View file

@ -726,4 +726,4 @@
月华飞溅落灵霄
亲密无间大乱揍
狼啸石牙飓风暴
炽魂热舞烈音爆
炽魂热舞烈音爆

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

View file

@ -230,4 +230,4 @@
1号道路
训练家学校
分隔岭隧道
分隔岭隧道

View file

@ -14,4 +14,4 @@ Pokémon GO
丰缘地区
阿罗拉地区
宝可度假地
城都地区
城都地区

View file

@ -85,4 +85,4 @@ Pokémon GO
宝可梦虚拟银行
宝可梦的店
体验版
the Pokémon Trainer Club
the Pokémon Trainer Club

View file

@ -1,4 +1,4 @@
远处的人
寄放屋
寻宝猎人
温泉婆婆
温泉婆婆

View file

@ -740,6 +740,12 @@
<None Include="Resources\img\Pokemon Sprites\800-1.png" />
<None Include="Resources\img\Pokemon Sprites\800-2.png" />
<None Include="Resources\img\Pokemon Sprites\800-3.png" />
<None Include="Resources\img\item\item_922.png" />
<None Include="Resources\img\item\item_923.png" />
<None Include="Resources\img\item\item_924.png" />
<None Include="Resources\img\item\item_925.png" />
<None Include="Resources\img\item\item_926.png" />
<None Include="Resources\img\item\item_921.png" />
<Content Include="Resources\img\Pokemon Sprites\803.png" />
<Content Include="Resources\img\Pokemon Sprites\804.png" />
<Content Include="Resources\img\Pokemon Sprites\805.png" />

View file

@ -19,7 +19,7 @@ namespace PKHeX.WinForms.Properties {
// class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project.
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources {
@ -17308,6 +17308,66 @@ namespace PKHeX.WinForms.Properties {
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap item_921 {
get {
object obj = ResourceManager.GetObject("item_921", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap item_922 {
get {
object obj = ResourceManager.GetObject("item_922", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap item_923 {
get {
object obj = ResourceManager.GetObject("item_923", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap item_924 {
get {
object obj = ResourceManager.GetObject("item_924", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap item_925 {
get {
object obj = ResourceManager.GetObject("item_925", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap item_926 {
get {
object obj = ResourceManager.GetObject("item_926", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>

View file

@ -5989,4 +5989,22 @@
<data name="_807" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\img\Pokemon Sprites\807.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="item_921" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\img\item\item_921.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="item_922" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\img\item\item_922.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="item_923" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\img\item\item_923.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="item_924" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\img\item\item_924.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="item_925" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\img\item\item_925.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="item_926" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\img\item\item_926.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>

Binary file not shown.

After

Width:  |  Height:  |  Size: 303 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 309 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 290 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 290 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 297 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 296 B