diff --git a/PKHeX/PKM/PK7.cs b/PKHeX/PKM/PK7.cs index 7f43c6575..ae1d32ed5 100644 --- a/PKHeX/PKM/PK7.cs +++ b/PKHeX/PKM/PK7.cs @@ -8,7 +8,7 @@ public class PK7 : PKM { internal static readonly byte[] ExtraBytes = { - 0x36, 0x37, // Unused Ribbons + // 0x36, 0x37, // Unused Ribbons 0x3B, 0x3C, 0x3D, 0x3E, 0x3F, 0x58, 0x59, 0x73, 0x90, 0x91, 0x9E, 0x9F, 0xA0, 0xA1, 0xA7, 0xAA, 0xAB, 0xAC, 0xAD, 0xC8, 0xC9, 0xD7, 0xE4, 0xE5, 0xE6, 0xE7 }; public sealed override int SIZE_PARTY => PKX.SIZE_6PARTY; diff --git a/PKHeX/PKM/PKX.cs b/PKHeX/PKM/PKX.cs index 86d045e66..6a6535335 100644 --- a/PKHeX/PKM/PKX.cs +++ b/PKHeX/PKM/PKX.cs @@ -851,6 +851,14 @@ public static string[] getFormList(int species, string[] t, string[] f, string[] t[014], // Chill }; + case 658: + return new[] + { + t[000], // Normal + "Ash", + "Bonded" + }; + case 664: case 665: case 666: diff --git a/PKHeX/Resources/text/de/text_Abilities_de.txt b/PKHeX/Resources/text/de/text_Abilities_de.txt index 1f6a29559..1ac70481c 100644 --- a/PKHeX/Resources/text/de/text_Abilities_de.txt +++ b/PKHeX/Resources/text/de/text_Abilities_de.txt @@ -189,4 +189,45 @@ Feenaura Aura-Umkehr Urmeer Endland -Delta-Wind \ No newline at end of file +Delta-Wind +192 +193 +194 +195 +196 +197 +Stakeout +199 +200 +201 +202 +203 +204 +205 +206 +207 +208 +209 +Battle Bond +211 +212 +213 +214 +215 +216 +217 +218 +219 +220 +221 +222 +223 +224 +225 +226 +227 +228 +229 +230 +231 +232 \ No newline at end of file diff --git a/PKHeX/Resources/text/de/text_Games_de.txt b/PKHeX/Resources/text/de/text_Games_de.txt index fe6fd2798..c14220c89 100644 --- a/PKHeX/Resources/text/de/text_Games_de.txt +++ b/PKHeX/Resources/text/de/text_Games_de.txt @@ -25,4 +25,8 @@ Schwarze2 X Y AS -OR \ No newline at end of file +OR + + +Sonne +Mond \ No newline at end of file diff --git a/PKHeX/Resources/text/de/text_Items_de.txt b/PKHeX/Resources/text/de/text_Items_de.txt index ae260ff0e..fc4a9f35b 100644 --- a/PKHeX/Resources/text/de/text_Items_de.txt +++ b/PKHeX/Resources/text/de/text_Items_de.txt @@ -773,4 +773,149 @@ Meteorit Meteorit Schlüssel-Stein Meteoritenstück -Äon-Flöte \ No newline at end of file +Äon-Flöte +776 +777 +778 +Electrium Z +780 +781 +782 +783 +784 +785 +786 +787 +788 +789 +790 +791 +792 +793 +794 +795 +796 +Z-Ring +798 +799 +800 +801 +802 +803 +804 +805 +806 +807 +808 +809 +Electrium Z (K) +811 +812 +813 +814 +815 +816 +817 +818 +819 +820 +821 +822 +823 +824 +825 +826 +827 +828 +829 +830 +831 +832 +833 +834 +835 +836 +837 +838 +839 +840 +841 +842 +843 +844 +845 +846 +847 +848 +849 +850 +851 +852 +853 +854 +855 +856 +857 +858 +859 +860 +861 +862 +863 +864 +865 +866 +867 +868 +869 +870 +871 +872 +873 +874 +875 +876 +877 +878 +879 +880 +881 +882 +883 +884 +885 +886 +887 +888 +889 +890 +891 +892 +893 +894 +895 +896 +897 +898 +899 +900 +901 +902 +903 +904 +905 +906 +907 +908 +909 +910 +911 +912 +913 +914 +915 +916 +917 +918 +919 +920 \ No newline at end of file diff --git a/PKHeX/Resources/text/de/text_Species_de.txt b/PKHeX/Resources/text/de/text_Species_de.txt index d8618627c..6134e7b48 100644 --- a/PKHeX/Resources/text/de/text_Species_de.txt +++ b/PKHeX/Resources/text/de/text_Species_de.txt @@ -719,4 +719,85 @@ Yveltal Zygarde Diancie Hoopa -Volcanion \ No newline at end of file +Volcanion +Rowlet +Dartrix +[Dartrix Evo] +Litten +Torracat +[Torracat Evo] +Popplio +Brionne +[Brionne Evo] +Pikipek +[Pikipek Evo] +[[Pikipek Evo] Evo] +Yungoos +Gumshoos +Grubbin +Charjabug +Vikavolt +Crabrawler +[Crabrawler Evo] +Oricorio +Cutiefly +Ribombee +Rockruff +Lycanroc +Wishiwashi +[Blue hair purple thing] +[[Blue hair purple thing] Evo] +Mudbray +Mudsdale +[Water Spider] +[[Water Spider] Evo] +Fomantis +Lurantis +Morelull +[Morelull Evo] +Salandit +[Salandit Evo] +Stufful +Bewear +Bounsweet +Steenee +Tsareena +Comfey +Oranguru +Passimian +Wimpod +[Wimpod Evo] +Sandygast +Palossand +Pyukumuku +Type: Null +Silvally +Minior +Komala +Turtonator +Togedemaru +Mimikyu +Bruxish +Drampa +[Sea Anchor] +Jangmo-o +Hakamo-o +Kommo-o +Tapu Koko +[Pink Tapu Koko] +[Red Tapu Koko] +[Purple Tapu Koko] +[Space Cloud] +[Galaxy Eye] +Solgaleo +Lunala +UB-01 +UB-02 Absorption +UB-02 Beauty +[UB-## Plugs] +[UB-## Pillars] +[UB-## Blades] +[UB-## Krabs] +[UB-## Crystals] +Magearna +Marshadow \ No newline at end of file diff --git a/PKHeX/Resources/text/en/text_Abilities_en.txt b/PKHeX/Resources/text/en/text_Abilities_en.txt index 6c6464ffc..02538341c 100644 --- a/PKHeX/Resources/text/en/text_Abilities_en.txt +++ b/PKHeX/Resources/text/en/text_Abilities_en.txt @@ -189,4 +189,45 @@ Fairy Aura Aura Break Primordial Sea Desolate Land -Delta Stream \ No newline at end of file +Delta Stream +192 +193 +194 +195 +196 +197 +Stakeout +199 +200 +201 +202 +203 +204 +205 +206 +207 +208 +209 +Battle Bond +211 +212 +213 +214 +215 +216 +217 +218 +219 +220 +221 +222 +223 +224 +225 +226 +227 +228 +229 +230 +231 +232 \ No newline at end of file diff --git a/PKHeX/Resources/text/en/text_Games_en.txt b/PKHeX/Resources/text/en/text_Games_en.txt index 286237350..6bb903c29 100644 --- a/PKHeX/Resources/text/en/text_Games_en.txt +++ b/PKHeX/Resources/text/en/text_Games_en.txt @@ -25,4 +25,8 @@ Black2 X Y AS -OR \ No newline at end of file +OR + + +Sun +Moon \ No newline at end of file diff --git a/PKHeX/Resources/text/en/text_Items_en.txt b/PKHeX/Resources/text/en/text_Items_en.txt index dd2c88ba5..5967aeb29 100644 --- a/PKHeX/Resources/text/en/text_Items_en.txt +++ b/PKHeX/Resources/text/en/text_Items_en.txt @@ -773,4 +773,149 @@ Meteorite Meteorite Key Stone Meteorite Shard -Eon Flute \ No newline at end of file +Eon Flute +776 +777 +778 +Electrium Z +780 +781 +782 +783 +784 +785 +786 +787 +788 +789 +790 +791 +792 +793 +794 +795 +796 +Z-Ring +798 +799 +800 +801 +802 +803 +804 +805 +806 +807 +808 +809 +Electrium Z (K) +811 +812 +813 +814 +815 +816 +817 +818 +819 +820 +821 +822 +823 +824 +825 +826 +827 +828 +829 +830 +831 +832 +833 +834 +835 +836 +837 +838 +839 +840 +841 +842 +843 +844 +845 +846 +847 +848 +849 +850 +851 +852 +853 +854 +855 +856 +857 +858 +859 +860 +861 +862 +863 +864 +865 +866 +867 +868 +869 +870 +871 +872 +873 +874 +875 +876 +877 +878 +879 +880 +881 +882 +883 +884 +885 +886 +887 +888 +889 +890 +891 +892 +893 +894 +895 +896 +897 +898 +899 +900 +901 +902 +903 +904 +905 +906 +907 +908 +909 +910 +911 +912 +913 +914 +915 +916 +917 +918 +919 +920 \ No newline at end of file diff --git a/PKHeX/Resources/text/en/text_Species_en.txt b/PKHeX/Resources/text/en/text_Species_en.txt index 792cf6d61..b97da7f71 100644 --- a/PKHeX/Resources/text/en/text_Species_en.txt +++ b/PKHeX/Resources/text/en/text_Species_en.txt @@ -719,4 +719,85 @@ Yveltal Zygarde Diancie Hoopa -Volcanion \ No newline at end of file +Volcanion +Rowlet +Dartrix +[Dartrix Evo] +Litten +Torracat +[Torracat Evo] +Popplio +Brionne +[Brionne Evo] +Pikipek +[Pikipek Evo] +[[Pikipek Evo] Evo] +Yungoos +Gumshoos +Grubbin +Charjabug +Vikavolt +Crabrawler +[Crabrawler Evo] +Oricorio +Cutiefly +Ribombee +Rockruff +Lycanroc +Wishiwashi +[Blue hair purple thing] +[[Blue hair purple thing] Evo] +Mudbray +Mudsdale +[Water Spider] +[[Water Spider] Evo] +Fomantis +Lurantis +Morelull +[Morelull Evo] +Salandit +[Salandit Evo] +Stufful +Bewear +Bounsweet +Steenee +Tsareena +Comfey +Oranguru +Passimian +Wimpod +[Wimpod Evo] +Sandygast +Palossand +Pyukumuku +Type: Null +Silvally +Minior +Komala +Turtonator +Togedemaru +Mimikyu +Bruxish +Drampa +[Sea Anchor] +Jangmo-o +Hakamo-o +Kommo-o +Tapu Koko +[Pink Tapu Koko] +[Red Tapu Koko] +[Purple Tapu Koko] +[Space Cloud] +[Galaxy Eye] +Solgaleo +Lunala +UB-01 +UB-02 Absorption +UB-02 Beauty +[UB-## Plugs] +[UB-## Pillars] +[UB-## Blades] +[UB-## Krabs] +[UB-## Crystals] +Magearna +Marshadow \ No newline at end of file diff --git a/PKHeX/Resources/text/es/text_Abilities_es.txt b/PKHeX/Resources/text/es/text_Abilities_es.txt index 795aa5110..ebee2b2cb 100644 --- a/PKHeX/Resources/text/es/text_Abilities_es.txt +++ b/PKHeX/Resources/text/es/text_Abilities_es.txt @@ -189,4 +189,45 @@ Aura Feérica Rompeaura Mar del Albor Tierra del Ocaso -Ráfaga Delta \ No newline at end of file +Ráfaga Delta +192 +193 +194 +195 +196 +197 +Stakeout +199 +200 +201 +202 +203 +204 +205 +206 +207 +208 +209 +Battle Bond +211 +212 +213 +214 +215 +216 +217 +218 +219 +220 +221 +222 +223 +224 +225 +226 +227 +228 +229 +230 +231 +232 \ No newline at end of file diff --git a/PKHeX/Resources/text/es/text_Games_es.txt b/PKHeX/Resources/text/es/text_Games_es.txt index 2b427b8ca..bfdf1fdba 100644 --- a/PKHeX/Resources/text/es/text_Games_es.txt +++ b/PKHeX/Resources/text/es/text_Games_es.txt @@ -25,4 +25,8 @@ Negra 2 X Y Zafiro Alfa -Rubí Omega \ No newline at end of file +Rubí Omega + + +Sol +Luna \ No newline at end of file diff --git a/PKHeX/Resources/text/es/text_Items_es.txt b/PKHeX/Resources/text/es/text_Items_es.txt index 61c42489d..08ba0d052 100644 --- a/PKHeX/Resources/text/es/text_Items_es.txt +++ b/PKHeX/Resources/text/es/text_Items_es.txt @@ -773,4 +773,149 @@ Meteorito Meteorito Piedra Activadora Frag. Meteorito -Flauta Eón \ No newline at end of file +Flauta Eón +776 +777 +778 +Electrium Z +780 +781 +782 +783 +784 +785 +786 +787 +788 +789 +790 +791 +792 +793 +794 +795 +796 +Z-Ring +798 +799 +800 +801 +802 +803 +804 +805 +806 +807 +808 +809 +Electrium Z (K) +811 +812 +813 +814 +815 +816 +817 +818 +819 +820 +821 +822 +823 +824 +825 +826 +827 +828 +829 +830 +831 +832 +833 +834 +835 +836 +837 +838 +839 +840 +841 +842 +843 +844 +845 +846 +847 +848 +849 +850 +851 +852 +853 +854 +855 +856 +857 +858 +859 +860 +861 +862 +863 +864 +865 +866 +867 +868 +869 +870 +871 +872 +873 +874 +875 +876 +877 +878 +879 +880 +881 +882 +883 +884 +885 +886 +887 +888 +889 +890 +891 +892 +893 +894 +895 +896 +897 +898 +899 +900 +901 +902 +903 +904 +905 +906 +907 +908 +909 +910 +911 +912 +913 +914 +915 +916 +917 +918 +919 +920 \ No newline at end of file diff --git a/PKHeX/Resources/text/es/text_Species_es.txt b/PKHeX/Resources/text/es/text_Species_es.txt index 5b318d93d..c635876f2 100644 --- a/PKHeX/Resources/text/es/text_Species_es.txt +++ b/PKHeX/Resources/text/es/text_Species_es.txt @@ -719,4 +719,85 @@ Yveltal Zygarde Diancie Hoopa -Volcanion \ No newline at end of file +Volcanion +Rowlet +Dartrix +[Dartrix Evo] +Litten +Torracat +[Torracat Evo] +Popplio +Brionne +[Brionne Evo] +Pikipek +[Pikipek Evo] +[[Pikipek Evo] Evo] +Yungoos +Gumshoos +Grubbin +Charjabug +Vikavolt +Crabrawler +[Crabrawler Evo] +Oricorio +Cutiefly +Ribombee +Rockruff +Lycanroc +Wishiwashi +[Blue hair purple thing] +[[Blue hair purple thing] Evo] +Mudbray +Mudsdale +[Water Spider] +[[Water Spider] Evo] +Fomantis +Lurantis +Morelull +[Morelull Evo] +Salandit +[Salandit Evo] +Stufful +Bewear +Bounsweet +Steenee +Tsareena +Comfey +Oranguru +Passimian +Wimpod +[Wimpod Evo] +Sandygast +Palossand +Pyukumuku +Type: Null +Silvally +Minior +Komala +Turtonator +Togedemaru +Mimikyu +Bruxish +Drampa +[Sea Anchor] +Jangmo-o +Hakamo-o +Kommo-o +Tapu Koko +[Pink Tapu Koko] +[Red Tapu Koko] +[Purple Tapu Koko] +[Space Cloud] +[Galaxy Eye] +Solgaleo +Lunala +UB-01 +UB-02 Absorption +UB-02 Beauty +[UB-## Plugs] +[UB-## Pillars] +[UB-## Blades] +[UB-## Krabs] +[UB-## Crystals] +Magearna +Marshadow \ No newline at end of file diff --git a/PKHeX/Resources/text/fr/text_Abilities_fr.txt b/PKHeX/Resources/text/fr/text_Abilities_fr.txt index f2be543f5..3d3e673f8 100644 --- a/PKHeX/Resources/text/fr/text_Abilities_fr.txt +++ b/PKHeX/Resources/text/fr/text_Abilities_fr.txt @@ -189,4 +189,45 @@ Aura Féérique Aura Inversée Mer Primaire Terre Finale -Souffle Delta \ No newline at end of file +Souffle Delta +192 +193 +194 +195 +196 +197 +Stakeout +199 +200 +201 +202 +203 +204 +205 +206 +207 +208 +209 +Battle Bond +211 +212 +213 +214 +215 +216 +217 +218 +219 +220 +221 +222 +223 +224 +225 +226 +227 +228 +229 +230 +231 +232 \ No newline at end of file diff --git a/PKHeX/Resources/text/fr/text_Games_fr.txt b/PKHeX/Resources/text/fr/text_Games_fr.txt index 66dbd453d..156b39fbf 100644 --- a/PKHeX/Resources/text/fr/text_Games_fr.txt +++ b/PKHeX/Resources/text/fr/text_Games_fr.txt @@ -25,4 +25,8 @@ Noire2 X Y AS -OR \ No newline at end of file +OR + + +Soleil +Lune \ No newline at end of file diff --git a/PKHeX/Resources/text/fr/text_Items_fr.txt b/PKHeX/Resources/text/fr/text_Items_fr.txt index 8c5ee8755..978dfafbd 100644 --- a/PKHeX/Resources/text/fr/text_Items_fr.txt +++ b/PKHeX/Resources/text/fr/text_Items_fr.txt @@ -773,4 +773,149 @@ Météorite Météorite Gemme Sésame Éclat Météorite -Flûte Éon \ No newline at end of file +Flûte Éon +776 +777 +778 +Electrium Z +780 +781 +782 +783 +784 +785 +786 +787 +788 +789 +790 +791 +792 +793 +794 +795 +796 +Z-Ring +798 +799 +800 +801 +802 +803 +804 +805 +806 +807 +808 +809 +Electrium Z (K) +811 +812 +813 +814 +815 +816 +817 +818 +819 +820 +821 +822 +823 +824 +825 +826 +827 +828 +829 +830 +831 +832 +833 +834 +835 +836 +837 +838 +839 +840 +841 +842 +843 +844 +845 +846 +847 +848 +849 +850 +851 +852 +853 +854 +855 +856 +857 +858 +859 +860 +861 +862 +863 +864 +865 +866 +867 +868 +869 +870 +871 +872 +873 +874 +875 +876 +877 +878 +879 +880 +881 +882 +883 +884 +885 +886 +887 +888 +889 +890 +891 +892 +893 +894 +895 +896 +897 +898 +899 +900 +901 +902 +903 +904 +905 +906 +907 +908 +909 +910 +911 +912 +913 +914 +915 +916 +917 +918 +919 +920 \ No newline at end of file diff --git a/PKHeX/Resources/text/fr/text_Species_fr.txt b/PKHeX/Resources/text/fr/text_Species_fr.txt index cd7e90f83..04a2396d1 100644 --- a/PKHeX/Resources/text/fr/text_Species_fr.txt +++ b/PKHeX/Resources/text/fr/text_Species_fr.txt @@ -719,4 +719,85 @@ Yveltal Zygarde Diancie Hoopa -Volcanion \ No newline at end of file +Volcanion +Rowlet +Dartrix +[Dartrix Evo] +Litten +Torracat +[Torracat Evo] +Popplio +Brionne +[Brionne Evo] +Pikipek +[Pikipek Evo] +[[Pikipek Evo] Evo] +Yungoos +Gumshoos +Grubbin +Charjabug +Vikavolt +Crabrawler +[Crabrawler Evo] +Oricorio +Cutiefly +Ribombee +Rockruff +Lycanroc +Wishiwashi +[Blue hair purple thing] +[[Blue hair purple thing] Evo] +Mudbray +Mudsdale +[Water Spider] +[[Water Spider] Evo] +Fomantis +Lurantis +Morelull +[Morelull Evo] +Salandit +[Salandit Evo] +Stufful +Bewear +Bounsweet +Steenee +Tsareena +Comfey +Oranguru +Passimian +Wimpod +[Wimpod Evo] +Sandygast +Palossand +Pyukumuku +Type: Null +Silvally +Minior +Komala +Turtonator +Togedemaru +Mimikyu +Bruxish +Drampa +[Sea Anchor] +Jangmo-o +Hakamo-o +Kommo-o +Tapu Koko +[Pink Tapu Koko] +[Red Tapu Koko] +[Purple Tapu Koko] +[Space Cloud] +[Galaxy Eye] +Solgaleo +Lunala +UB-01 +UB-02 Absorption +UB-02 Beauty +[UB-## Plugs] +[UB-## Pillars] +[UB-## Blades] +[UB-## Krabs] +[UB-## Crystals] +Magearna +Marshadow \ No newline at end of file diff --git a/PKHeX/Resources/text/it/text_Abilities_it.txt b/PKHeX/Resources/text/it/text_Abilities_it.txt index acac8d172..538a6b2e3 100644 --- a/PKHeX/Resources/text/it/text_Abilities_it.txt +++ b/PKHeX/Resources/text/it/text_Abilities_it.txt @@ -189,4 +189,45 @@ Aurafolletto Frangiaura Mare Primordiale Terra Estrema -Flusso Delta \ No newline at end of file +Flusso Delta +192 +193 +194 +195 +196 +197 +Stakeout +199 +200 +201 +202 +203 +204 +205 +206 +207 +208 +209 +Battle Bond +211 +212 +213 +214 +215 +216 +217 +218 +219 +220 +221 +222 +223 +224 +225 +226 +227 +228 +229 +230 +231 +232 \ No newline at end of file diff --git a/PKHeX/Resources/text/it/text_Games_it.txt b/PKHeX/Resources/text/it/text_Games_it.txt index 26a15a782..d24d47b4b 100644 --- a/PKHeX/Resources/text/it/text_Games_it.txt +++ b/PKHeX/Resources/text/it/text_Games_it.txt @@ -25,4 +25,8 @@ Nera2 X Y AS -OR \ No newline at end of file +OR + + +Sole +Luna \ No newline at end of file diff --git a/PKHeX/Resources/text/it/text_Items_it.txt b/PKHeX/Resources/text/it/text_Items_it.txt index c7dddebc2..f2b9df660 100644 --- a/PKHeX/Resources/text/it/text_Items_it.txt +++ b/PKHeX/Resources/text/it/text_Items_it.txt @@ -773,4 +773,149 @@ Meteorite Meteorite Pietrachiave Framm. meteorite -Flauto Eone \ No newline at end of file +Flauto Eone +776 +777 +778 +Electrium Z +780 +781 +782 +783 +784 +785 +786 +787 +788 +789 +790 +791 +792 +793 +794 +795 +796 +Z-Ring +798 +799 +800 +801 +802 +803 +804 +805 +806 +807 +808 +809 +Electrium Z (K) +811 +812 +813 +814 +815 +816 +817 +818 +819 +820 +821 +822 +823 +824 +825 +826 +827 +828 +829 +830 +831 +832 +833 +834 +835 +836 +837 +838 +839 +840 +841 +842 +843 +844 +845 +846 +847 +848 +849 +850 +851 +852 +853 +854 +855 +856 +857 +858 +859 +860 +861 +862 +863 +864 +865 +866 +867 +868 +869 +870 +871 +872 +873 +874 +875 +876 +877 +878 +879 +880 +881 +882 +883 +884 +885 +886 +887 +888 +889 +890 +891 +892 +893 +894 +895 +896 +897 +898 +899 +900 +901 +902 +903 +904 +905 +906 +907 +908 +909 +910 +911 +912 +913 +914 +915 +916 +917 +918 +919 +920 \ No newline at end of file diff --git a/PKHeX/Resources/text/it/text_Species_it.txt b/PKHeX/Resources/text/it/text_Species_it.txt index d17ee042c..03e58e583 100644 --- a/PKHeX/Resources/text/it/text_Species_it.txt +++ b/PKHeX/Resources/text/it/text_Species_it.txt @@ -719,4 +719,85 @@ Yveltal Zygarde Diancie Hoopa -Volcanion \ No newline at end of file +Volcanion +Rowlet +Dartrix +[Dartrix Evo] +Litten +Torracat +[Torracat Evo] +Popplio +Brionne +[Brionne Evo] +Pikipek +[Pikipek Evo] +[[Pikipek Evo] Evo] +Yungoos +Gumshoos +Grubbin +Charjabug +Vikavolt +Crabrawler +[Crabrawler Evo] +Oricorio +Cutiefly +Ribombee +Rockruff +Lycanroc +Wishiwashi +[Blue hair purple thing] +[[Blue hair purple thing] Evo] +Mudbray +Mudsdale +[Water Spider] +[[Water Spider] Evo] +Fomantis +Lurantis +Morelull +[Morelull Evo] +Salandit +[Salandit Evo] +Stufful +Bewear +Bounsweet +Steenee +Tsareena +Comfey +Oranguru +Passimian +Wimpod +[Wimpod Evo] +Sandygast +Palossand +Pyukumuku +Type: Null +Silvally +Minior +Komala +Turtonator +Togedemaru +Mimikyu +Bruxish +Drampa +[Sea Anchor] +Jangmo-o +Hakamo-o +Kommo-o +Tapu Koko +[Pink Tapu Koko] +[Red Tapu Koko] +[Purple Tapu Koko] +[Space Cloud] +[Galaxy Eye] +Solgaleo +Lunala +UB-01 +UB-02 Absorption +UB-02 Beauty +[UB-## Plugs] +[UB-## Pillars] +[UB-## Blades] +[UB-## Krabs] +[UB-## Crystals] +Magearna +Marshadow \ No newline at end of file diff --git a/PKHeX/Resources/text/ja/text_Abilities_ja.txt b/PKHeX/Resources/text/ja/text_Abilities_ja.txt index 16d366f15..de29cfd8f 100644 --- a/PKHeX/Resources/text/ja/text_Abilities_ja.txt +++ b/PKHeX/Resources/text/ja/text_Abilities_ja.txt @@ -189,4 +189,45 @@ オーラブレイク はじまりのうみ おわりのだいち -デルタストリーム \ No newline at end of file +デルタストリーム +192 +193 +194 +195 +196 +197 +Stakeout +199 +200 +201 +202 +203 +204 +205 +206 +207 +208 +209 +Battle Bond +211 +212 +213 +214 +215 +216 +217 +218 +219 +220 +221 +222 +223 +224 +225 +226 +227 +228 +229 +230 +231 +232 \ No newline at end of file diff --git a/PKHeX/Resources/text/ja/text_Games_ja.txt b/PKHeX/Resources/text/ja/text_Games_ja.txt index 289ce46e5..dcba14fcd 100644 --- a/PKHeX/Resources/text/ja/text_Games_ja.txt +++ b/PKHeX/Resources/text/ja/text_Games_ja.txt @@ -25,4 +25,8 @@ X Y AS -OR \ No newline at end of file +OR + + +サン +ムーン \ No newline at end of file diff --git a/PKHeX/Resources/text/ja/text_Items_ja.txt b/PKHeX/Resources/text/ja/text_Items_ja.txt index c19d34645..882444c6d 100644 --- a/PKHeX/Resources/text/ja/text_Items_ja.txt +++ b/PKHeX/Resources/text/ja/text_Items_ja.txt @@ -773,4 +773,149 @@ いんせき キーストーン いんせきのかけら -むげんのふえ \ No newline at end of file +むげんのふえ +776 +777 +778 +Electrium Z +780 +781 +782 +783 +784 +785 +786 +787 +788 +789 +790 +791 +792 +793 +794 +795 +796 +Z-Ring +798 +799 +800 +801 +802 +803 +804 +805 +806 +807 +808 +809 +Electrium Z (K) +811 +812 +813 +814 +815 +816 +817 +818 +819 +820 +821 +822 +823 +824 +825 +826 +827 +828 +829 +830 +831 +832 +833 +834 +835 +836 +837 +838 +839 +840 +841 +842 +843 +844 +845 +846 +847 +848 +849 +850 +851 +852 +853 +854 +855 +856 +857 +858 +859 +860 +861 +862 +863 +864 +865 +866 +867 +868 +869 +870 +871 +872 +873 +874 +875 +876 +877 +878 +879 +880 +881 +882 +883 +884 +885 +886 +887 +888 +889 +890 +891 +892 +893 +894 +895 +896 +897 +898 +899 +900 +901 +902 +903 +904 +905 +906 +907 +908 +909 +910 +911 +912 +913 +914 +915 +916 +917 +918 +919 +920 \ No newline at end of file diff --git a/PKHeX/Resources/text/ja/text_Species_ja.txt b/PKHeX/Resources/text/ja/text_Species_ja.txt index 13d4cb7b7..d774e00a7 100644 --- a/PKHeX/Resources/text/ja/text_Species_ja.txt +++ b/PKHeX/Resources/text/ja/text_Species_ja.txt @@ -719,4 +719,85 @@ ジガルデ ディアンシー フーパ -ボルケニオン \ No newline at end of file +ボルケニオン +Rowlet +Dartrix +[Dartrix Evo] +Litten +Torracat +[Torracat Evo] +Popplio +Brionne +[Brionne Evo] +Pikipek +[Pikipek Evo] +[[Pikipek Evo] Evo] +Yungoos +Gumshoos +Grubbin +Charjabug +Vikavolt +Crabrawler +[Crabrawler Evo] +Oricorio +Cutiefly +Ribombee +Rockruff +Lycanroc +Wishiwashi +[Blue hair purple thing] +[[Blue hair purple thing] Evo] +Mudbray +Mudsdale +[Water Spider] +[[Water Spider] Evo] +Fomantis +Lurantis +Morelull +[Morelull Evo] +Salandit +[Salandit Evo] +Stufful +Bewear +Bounsweet +Steenee +Tsareena +Comfey +Oranguru +Passimian +Wimpod +[Wimpod Evo] +Sandygast +Palossand +Pyukumuku +Type: Null +Silvally +Minior +Komala +Turtonator +Togedemaru +Mimikyu +Bruxish +Drampa +[Sea Anchor] +Jangmo-o +Hakamo-o +Kommo-o +Tapu Koko +[Pink Tapu Koko] +[Red Tapu Koko] +[Purple Tapu Koko] +[Space Cloud] +[Galaxy Eye] +Solgaleo +Lunala +UB-01 +UB-02 Absorption +UB-02 Beauty +[UB-## Plugs] +[UB-## Pillars] +[UB-## Blades] +[UB-## Krabs] +[UB-## Crystals] +Magearna +Marshadow \ No newline at end of file diff --git a/PKHeX/Resources/text/ko/text_Abilities_ko.txt b/PKHeX/Resources/text/ko/text_Abilities_ko.txt index e95cf4a25..c56b05384 100644 --- a/PKHeX/Resources/text/ko/text_Abilities_ko.txt +++ b/PKHeX/Resources/text/ko/text_Abilities_ko.txt @@ -189,4 +189,45 @@ 오라브레이크 시작의바다 끝의대지 -델타스트림 \ No newline at end of file +델타스트림 +192 +193 +194 +195 +196 +197 +Stakeout +199 +200 +201 +202 +203 +204 +205 +206 +207 +208 +209 +Battle Bond +211 +212 +213 +214 +215 +216 +217 +218 +219 +220 +221 +222 +223 +224 +225 +226 +227 +228 +229 +230 +231 +232 \ No newline at end of file diff --git a/PKHeX/Resources/text/ko/text_Games_ko.txt b/PKHeX/Resources/text/ko/text_Games_ko.txt index 9390d33aa..d31d403e5 100644 --- a/PKHeX/Resources/text/ko/text_Games_ko.txt +++ b/PKHeX/Resources/text/ko/text_Games_ko.txt @@ -25,4 +25,8 @@ Pt기라티나 X Y AS -OR \ No newline at end of file +OR + + +썬 +문 \ No newline at end of file diff --git a/PKHeX/Resources/text/ko/text_Items_ko.txt b/PKHeX/Resources/text/ko/text_Items_ko.txt index 6e696d50d..a708dd0a8 100644 --- a/PKHeX/Resources/text/ko/text_Items_ko.txt +++ b/PKHeX/Resources/text/ko/text_Items_ko.txt @@ -773,4 +773,149 @@ TMV패스 운석 키스톤 운석조각 -무한의피리 \ No newline at end of file +무한의피리 +776 +777 +778 +Electrium Z +780 +781 +782 +783 +784 +785 +786 +787 +788 +789 +790 +791 +792 +793 +794 +795 +796 +Z-Ring +798 +799 +800 +801 +802 +803 +804 +805 +806 +807 +808 +809 +Electrium Z (K) +811 +812 +813 +814 +815 +816 +817 +818 +819 +820 +821 +822 +823 +824 +825 +826 +827 +828 +829 +830 +831 +832 +833 +834 +835 +836 +837 +838 +839 +840 +841 +842 +843 +844 +845 +846 +847 +848 +849 +850 +851 +852 +853 +854 +855 +856 +857 +858 +859 +860 +861 +862 +863 +864 +865 +866 +867 +868 +869 +870 +871 +872 +873 +874 +875 +876 +877 +878 +879 +880 +881 +882 +883 +884 +885 +886 +887 +888 +889 +890 +891 +892 +893 +894 +895 +896 +897 +898 +899 +900 +901 +902 +903 +904 +905 +906 +907 +908 +909 +910 +911 +912 +913 +914 +915 +916 +917 +918 +919 +920 \ No newline at end of file diff --git a/PKHeX/Resources/text/ko/text_Species_ko.txt b/PKHeX/Resources/text/ko/text_Species_ko.txt index 878335c4f..aa26c9f9e 100644 --- a/PKHeX/Resources/text/ko/text_Species_ko.txt +++ b/PKHeX/Resources/text/ko/text_Species_ko.txt @@ -719,4 +719,85 @@ 지가르데 디안시 후파 -볼케니온 \ No newline at end of file +볼케니온 +Rowlet +Dartrix +[Dartrix Evo] +Litten +Torracat +[Torracat Evo] +Popplio +Brionne +[Brionne Evo] +Pikipek +[Pikipek Evo] +[[Pikipek Evo] Evo] +Yungoos +Gumshoos +Grubbin +Charjabug +Vikavolt +Crabrawler +[Crabrawler Evo] +Oricorio +Cutiefly +Ribombee +Rockruff +Lycanroc +Wishiwashi +[Blue hair purple thing] +[[Blue hair purple thing] Evo] +Mudbray +Mudsdale +[Water Spider] +[[Water Spider] Evo] +Fomantis +Lurantis +Morelull +[Morelull Evo] +Salandit +[Salandit Evo] +Stufful +Bewear +Bounsweet +Steenee +Tsareena +Comfey +Oranguru +Passimian +Wimpod +[Wimpod Evo] +Sandygast +Palossand +Pyukumuku +Type: Null +Silvally +Minior +Komala +Turtonator +Togedemaru +Mimikyu +Bruxish +Drampa +[Sea Anchor] +Jangmo-o +Hakamo-o +Kommo-o +Tapu Koko +[Pink Tapu Koko] +[Red Tapu Koko] +[Purple Tapu Koko] +[Space Cloud] +[Galaxy Eye] +Solgaleo +Lunala +UB-01 +UB-02 Absorption +UB-02 Beauty +[UB-## Plugs] +[UB-## Pillars] +[UB-## Blades] +[UB-## Krabs] +[UB-## Crystals] +Magearna +Marshadow \ No newline at end of file diff --git a/PKHeX/Resources/text/zh/text_Abilities_zh.txt b/PKHeX/Resources/text/zh/text_Abilities_zh.txt index 27695ee03..456564101 100644 --- a/PKHeX/Resources/text/zh/text_Abilities_zh.txt +++ b/PKHeX/Resources/text/zh/text_Abilities_zh.txt @@ -189,4 +189,45 @@ 气场破坏 始源之海 终结之地 -德尔塔气流 \ No newline at end of file +德尔塔气流 +192 +193 +194 +195 +196 +197 +Stakeout +199 +200 +201 +202 +203 +204 +205 +206 +207 +208 +209 +Battle Bond +211 +212 +213 +214 +215 +216 +217 +218 +219 +220 +221 +222 +223 +224 +225 +226 +227 +228 +229 +230 +231 +232 \ No newline at end of file diff --git a/PKHeX/Resources/text/zh/text_Games_zh.txt b/PKHeX/Resources/text/zh/text_Games_zh.txt index f27c9c7ad..4b3188212 100644 --- a/PKHeX/Resources/text/zh/text_Games_zh.txt +++ b/PKHeX/Resources/text/zh/text_Games_zh.txt @@ -26,3 +26,7 @@ X Y 始源蓝宝石 终极红宝石 + + +太阳 +月亮 \ No newline at end of file diff --git a/PKHeX/Resources/text/zh/text_Items_zh.txt b/PKHeX/Resources/text/zh/text_Items_zh.txt index 59647d131..f7ec5be62 100644 --- a/PKHeX/Resources/text/zh/text_Items_zh.txt +++ b/PKHeX/Resources/text/zh/text_Items_zh.txt @@ -773,4 +773,149 @@ 陨石 钥石 陨石碎片 -无限之笛 \ No newline at end of file +无限之笛 +776 +777 +778 +Electrium Z +780 +781 +782 +783 +784 +785 +786 +787 +788 +789 +790 +791 +792 +793 +794 +795 +796 +Z-Ring +798 +799 +800 +801 +802 +803 +804 +805 +806 +807 +808 +809 +Electrium Z (K) +811 +812 +813 +814 +815 +816 +817 +818 +819 +820 +821 +822 +823 +824 +825 +826 +827 +828 +829 +830 +831 +832 +833 +834 +835 +836 +837 +838 +839 +840 +841 +842 +843 +844 +845 +846 +847 +848 +849 +850 +851 +852 +853 +854 +855 +856 +857 +858 +859 +860 +861 +862 +863 +864 +865 +866 +867 +868 +869 +870 +871 +872 +873 +874 +875 +876 +877 +878 +879 +880 +881 +882 +883 +884 +885 +886 +887 +888 +889 +890 +891 +892 +893 +894 +895 +896 +897 +898 +899 +900 +901 +902 +903 +904 +905 +906 +907 +908 +909 +910 +911 +912 +913 +914 +915 +916 +917 +918 +919 +920 \ No newline at end of file diff --git a/PKHeX/Resources/text/zh/text_Species_zh.txt b/PKHeX/Resources/text/zh/text_Species_zh.txt index 2be3dae52..3c2b524ce 100644 --- a/PKHeX/Resources/text/zh/text_Species_zh.txt +++ b/PKHeX/Resources/text/zh/text_Species_zh.txt @@ -719,4 +719,85 @@ 基格尔德 蒂安希 胡帕 -波尔凯尼恩 \ No newline at end of file +波尔凯尼恩 +Rowlet +Dartrix +[Dartrix Evo] +Litten +Torracat +[Torracat Evo] +Popplio +Brionne +[Brionne Evo] +Pikipek +[Pikipek Evo] +[[Pikipek Evo] Evo] +Yungoos +Gumshoos +Grubbin +Charjabug +Vikavolt +Crabrawler +[Crabrawler Evo] +Oricorio +Cutiefly +Ribombee +Rockruff +Lycanroc +Wishiwashi +[Blue hair purple thing] +[[Blue hair purple thing] Evo] +Mudbray +Mudsdale +[Water Spider] +[[Water Spider] Evo] +Fomantis +Lurantis +Morelull +[Morelull Evo] +Salandit +[Salandit Evo] +Stufful +Bewear +Bounsweet +Steenee +Tsareena +Comfey +Oranguru +Passimian +Wimpod +[Wimpod Evo] +Sandygast +Palossand +Pyukumuku +Type: Null +Silvally +Minior +Komala +Turtonator +Togedemaru +Mimikyu +Bruxish +Drampa +[Sea Anchor] +Jangmo-o +Hakamo-o +Kommo-o +Tapu Koko +[Pink Tapu Koko] +[Red Tapu Koko] +[Purple Tapu Koko] +[Space Cloud] +[Galaxy Eye] +Solgaleo +Lunala +UB-01 +UB-02 Absorption +UB-02 Beauty +[UB-## Plugs] +[UB-## Pillars] +[UB-## Blades] +[UB-## Krabs] +[UB-## Crystals] +Magearna +Marshadow \ No newline at end of file