diff --git a/PKHeX.csproj b/PKHeX.csproj
index b01803dcf..9e8f5b4d6 100644
--- a/PKHeX.csproj
+++ b/PKHeX.csproj
@@ -708,6 +708,7 @@
+
diff --git a/PKM/PKX.cs b/PKM/PKX.cs
index b06ffdc95..7ba8fffa6 100644
--- a/PKM/PKX.cs
+++ b/PKM/PKX.cs
@@ -457,7 +457,7 @@ namespace PKHeX
}
// Data Requests
- internal static Image getSprite(int species, int form, int gender, int item, bool isegg, bool shiny)
+ internal static Image getSprite(int species, int form, int gender, int item, bool isegg, bool shiny, int generation = -1)
{
if (species == 0)
return (Image)Resources.ResourceManager.GetObject("_0");
@@ -499,6 +499,9 @@ namespace PKHeX
if (item > 0)
{
Image itemimg = (Image)Resources.ResourceManager.GetObject("item_" + item) ?? Resources.helditem;
+ if ((generation == 3 || generation == 4) && 328 <= item && item <= 419) // gen3/4 TM
+ itemimg = Resources.item_tm;
+
// Redraw
baseImage = Util.LayerImage(baseImage, itemimg, 22 + (15 - itemimg.Width) / 2, 15 + (15 - itemimg.Height), 1);
}
@@ -506,7 +509,7 @@ namespace PKHeX
}
internal static Image getSprite(PKM pkm)
{
- return getSprite(pkm.Species, pkm.AltForm, pkm.Gender, pkm.HeldItem, pkm.IsEgg, pkm.IsShiny);
+ return getSprite(pkm.Species, pkm.AltForm, pkm.Gender, pkm.HeldItem, pkm.IsEgg, pkm.IsShiny, pkm.Format);
}
// Font Related
diff --git a/Properties/Resources.Designer.cs b/Properties/Resources.Designer.cs
index 131bc6ca5..3e10c76ee 100644
--- a/Properties/Resources.Designer.cs
+++ b/Properties/Resources.Designer.cs
@@ -15132,6 +15132,16 @@ namespace PKHeX.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ internal static System.Drawing.Bitmap item_tm {
+ get {
+ object obj = ResourceManager.GetObject("item_tm", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
///
/// Looks up a localized string similar to ! PKHeX Interface Customization File
///! Languages: Save this file accordingly and put it in the same folder as PKHeX's executable.
@@ -15181,11 +15191,11 @@ namespace PKHeX.Properties {
///
/// Looks up a localized string similar to ! PKHeX Interface Customization File
///! Languages: Save this file accordingly and put it in the same folder as PKHeX's executable.
- ///! lang_en.txt = English
- ///! lang_jp.txt = Japanese
+ ///! lang_en.txt = Inglés
+ ///! lang_jp.txt = Japonés
///! lang_fr.txt = French
- ///! lang_de.txt = German
- ///! lang_es.txt = Spanish
+ ///! lang_de.txt = Alemán
+ ///! lang_es.txt = Español
///! lang_it.txt = Italian
///! lang_ko.txt = Korean
///! lang_zh.txt = Chinese
@@ -15193,7 +15203,7 @@ namespace PKHeX.Properties {
///! Make sure that each edit has a ' = ' between Control name and new Text!
///!
///! -----------------------------------------------------
- ///- DO NOT CHANGE THI [rest of string was truncated]";.
+ ///- DO NOT CHANGE THIS [rest of string was truncated]";.
///
internal static string lang_es {
get {
@@ -20500,18 +20510,18 @@ namespace PKHeX.Properties {
///
/// Looks up a localized string similar to None
- ///Rock Smash (HGSS)
- ///Tall Grass
+ ///Golpe roca (HGSS)
+ ///Hierba Alta
///
///Dialga/Palkia
- ///Cave/Hall of Origin
+ ///Cueva/Sala del Origen
///
- ///Surfing/Fishing
+ ///Surfeando/Pescando
///
- ///Building/Enigma Stone
- ///Marsh/Safari
+ ///Edificio/Misticristal
+ ///Pantano/Safari
///
- ///Starter/Fossil/Gift (DP)
+ ///Inicial/Fosil/Regalo (DP)
///
///
///
@@ -20522,8 +20532,8 @@ namespace PKHeX.Properties {
///
///
///
- ///Distortion World (Pt)
- ///Starter/Fossil/Gift (Pt/DP Trio).
+ ///Mundo Distorsion (Pt)
+ ///Inicial/Fosil/Regalo (Pt/DP Trio).
///
internal static string text_encountertype_es {
get {
@@ -20697,7 +20707,7 @@ namespace PKHeX.Properties {
}
///
- /// Looks up a localized string similar to
+ /// Looks up a localized string similar to Spiky
///
///
///
@@ -20949,9 +20959,7 @@ namespace PKHeX.Properties {
///
///
///
- ///
- ///
- ///
/// [rest of string was truncated]";.
+ /// [rest of string was truncated]";.
///
internal static string text_forms_de {
get {
@@ -20960,7 +20968,7 @@ namespace PKHeX.Properties {
}
///
- /// Looks up a localized string similar to
+ /// Looks up a localized string similar to Spiky
///
///
///
@@ -21212,9 +21220,7 @@ namespace PKHeX.Properties {
///
///
///
- ///
- ///
- ///
/// [rest of string was truncated]";.
+ /// [rest of string was truncated]";.
///
internal static string text_forms_en {
get {
@@ -21223,7 +21229,7 @@ namespace PKHeX.Properties {
}
///
- /// Looks up a localized string similar to
+ /// Looks up a localized string similar to Spiky
///
///
///
@@ -21474,10 +21480,7 @@ namespace PKHeX.Properties {
///
///
///
- ///
- ///
- ///
- /// [rest of string was truncated]";.
+ ///
/// [rest of string was truncated]";.
///
internal static string text_forms_es {
get {
@@ -21486,7 +21489,7 @@ namespace PKHeX.Properties {
}
///
- /// Looks up a localized string similar to
+ /// Looks up a localized string similar to Spiky
///
///
///
@@ -21736,10 +21739,7 @@ namespace PKHeX.Properties {
///
///
///
- ///
- ///
- ///
- /// [rest of string was truncated]";.
+ ///
/// [rest of string was truncated]";.
///
internal static string text_forms_fr {
get {
@@ -21748,7 +21748,7 @@ namespace PKHeX.Properties {
}
///
- /// Looks up a localized string similar to
+ /// Looks up a localized string similar to Spiky
///
///
///
@@ -21999,10 +21999,7 @@ namespace PKHeX.Properties {
///
///
///
- ///
- ///
- ///
- /// [rest of string was truncated]";.
+ ///
/// [rest of string was truncated]";.
///
internal static string text_forms_it {
get {
@@ -22011,7 +22008,7 @@ namespace PKHeX.Properties {
}
///
- /// Looks up a localized string similar to
+ /// Looks up a localized string similar to Spiky
///
///
///
@@ -22262,9 +22259,7 @@ namespace PKHeX.Properties {
///
///
///
- ///
- ///
- ///
/// [rest of string was truncated]";.
+ /// [rest of string was truncated]";.
///
internal static string text_forms_ja {
get {
@@ -22273,7 +22268,7 @@ namespace PKHeX.Properties {
}
///
- /// Looks up a localized string similar to
+ /// Looks up a localized string similar to Spiky
///
///
///
@@ -22525,9 +22520,7 @@ namespace PKHeX.Properties {
///
///
///
- ///
- ///
- ///
/// [rest of string was truncated]";.
+ /// [rest of string was truncated]";.
///
internal static string text_forms_ko {
get {
@@ -22536,7 +22529,7 @@ namespace PKHeX.Properties {
}
///
- /// Looks up a localized string similar to
+ /// Looks up a localized string similar to Spiky
///
///
///
@@ -22787,10 +22780,7 @@ namespace PKHeX.Properties {
///
///
///
- ///
- ///
- ///
- /// [rest of string was truncated]";.
+ ///
/// [rest of string was truncated]";.
///
internal static string text_forms_zh {
get {
@@ -22878,8 +22868,8 @@ namespace PKHeX.Properties {
///RojoFuego
///VerdeHoja
///
- ///HeartGold
- ///SoulSilver
+ ///Oro HeartGold
+ ///Plata SoulSilver
///
///Diamante
///Perla
@@ -22897,8 +22887,8 @@ namespace PKHeX.Properties {
///Negra2
///X
///Y
- ///AS
- ///OR.
+ ///Zafiro Alfa
+ ///Rubí Omega.
///
internal static string text_games_es {
get {
diff --git a/Properties/Resources.resx b/Properties/Resources.resx
index da26da620..10d5e449e 100644
--- a/Properties/Resources.resx
+++ b/Properties/Resources.resx
@@ -6382,4 +6382,7 @@
..\Resources\img\box\slotView.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\img\item\item_tm.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
\ No newline at end of file
diff --git a/Resources/img/item/item_tm.png b/Resources/img/item/item_tm.png
new file mode 100644
index 000000000..1d170e8b7
Binary files /dev/null and b/Resources/img/item/item_tm.png differ