From dfcd93bfff172b5456859777b93a24315f843a90 Mon Sep 17 00:00:00 2001
From: Kurt <kaphotics@gmail.com>
Date: Sat, 16 Nov 2019 08:46:59 -0800
Subject: [PATCH] Fix alcremie form list, use toxtricity0 amped

https://projectpokemon.org/home/forums/topic/55410-alcreamie-mismatches/
---
 PKHeX.Core/PKM/Util/FormConverter.cs          |   3 ++-
 .../Resources/text/de/text_Forms_de.txt       |   4 ++--
 .../Resources/text/en/text_Forms_en.txt       | Bin 7364 -> 7410 bytes
 .../Resources/text/es/text_Forms_es.txt       | Bin 7702 -> 7746 bytes
 .../Resources/text/fr/text_Forms_fr.txt       | Bin 7626 -> 7660 bytes
 .../Resources/text/it/text_Forms_it.txt       | Bin 7920 -> 7960 bytes
 .../Resources/text/ja/text_Forms_ja.txt       |   4 ++--
 .../Resources/text/ko/text_Forms_ko.txt       | Bin 7290 -> 7312 bytes
 .../Resources/text/zh/text_Forms_zh.txt       | Bin 7036 -> 7054 bytes
 9 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/PKHeX.Core/PKM/Util/FormConverter.cs b/PKHeX.Core/PKM/Util/FormConverter.cs
index ac58d0d98..a3591ffd7 100644
--- a/PKHeX.Core/PKM/Util/FormConverter.cs
+++ b/PKHeX.Core/PKM/Util/FormConverter.cs
@@ -546,7 +546,7 @@ namespace PKHeX.Core
                 case Toxtricity:
                     return new[]
                     {
-                        types[0], // Normal
+                        forms[(int)Toxtricity], // Amped
                         forms[LowKey],
                     };
 
@@ -568,6 +568,7 @@ namespace PKHeX.Core
                 case Alcremie:
                     return new[]
                     {
+                        forms[(int)Alcremie], // Vanilla Cream
                         forms[RubyCream],
                         forms[MatchaCream],
                         forms[MintCream],
diff --git a/PKHeX.Core/Resources/text/de/text_Forms_de.txt b/PKHeX.Core/Resources/text/de/text_Forms_de.txt
index 3cd2f3b9b..44f8ce17f 100644
--- a/PKHeX.Core/Resources/text/de/text_Forms_de.txt
+++ b/PKHeX.Core/Resources/text/de/text_Forms_de.txt
@@ -847,6 +847,7 @@ Mega
 
 
 
+Hoch
 
 
 
@@ -866,8 +867,7 @@ Mega
 
 
 
-
-
+Vanille-Creme
 
 
 Mega
diff --git a/PKHeX.Core/Resources/text/en/text_Forms_en.txt b/PKHeX.Core/Resources/text/en/text_Forms_en.txt
index c84db31704e4153ff0b77c212f57329fe6084280..e032baa588d6580388991f90b3023add5eaf23af 100644
GIT binary patch
delta 62
zcmX?N`N?vFkf5+5LoP!BLn=cGg93vaLq0<hL+<22wm``+hD3%uhD?SWAWQ_xIRj-<
MfvnukiGs=80O7F?U;qFB

delta 19
bcmexldBk#qkl;jxn929}L^f{_bm9g8Qi2Cv

diff --git a/PKHeX.Core/Resources/text/es/text_Forms_es.txt b/PKHeX.Core/Resources/text/es/text_Forms_es.txt
index 035c53a2d23d71fa6ee2f437f8c149cb8e4f01a3..e5ab6ef86796cafa1910a29263f807616349c9e5 100644
GIT binary patch
delta 62
zcmbPcbI4|cjUc-tLpnn#L(1fXY|4`Z*bEe%8HyNE8FCpC859^&fGh=uFd#dVArFXi
MfG}}$w_rC90QVmc6aWAK

delta 19
bcmX?PGtFj$jo@Sh_L#}vgl#qnIq?7hOV9@1

diff --git a/PKHeX.Core/Resources/text/fr/text_Forms_fr.txt b/PKHeX.Core/Resources/text/fr/text_Forms_fr.txt
index 518e5bbaafee464eb1824958a74b6331c48b5bfc..f7001e8ffee4bda51152cff85d7ade8fdf7166a5 100644
GIT binary patch
delta 54
zcmX?Q{l<DjgdnFQLncEy!yks!$%gEK;yw(CKz<2>0z(*(l?P<!0AcFn-6E2k4+wJc
F005}&4t@Xt

delta 28
gcmaE3ead=6gy2Mln8~k1cqR#YfRVxGMM7TO0H_NJRR910

diff --git a/PKHeX.Core/Resources/text/it/text_Forms_it.txt b/PKHeX.Core/Resources/text/it/text_Forms_it.txt
index 6bfddf2af439ffcbddf90957e2a77e97a4d35a50..44c6773e364b4555f360cadfbcb10d4a47617b90 100644
GIT binary patch
delta 63
zcmexhJHu|n62VDAESxzE`3xxxnGA`O9oYgUeHaoMN`Nqxp$y2%1B$0J<bY)p`4uNC
M2(8(CK*)dx05h)<0ssI2

delta 23
fcmbPX_rZ3<62XZIF_ZK7MJ6W*P1$@w$b$y}cJ>Jz

diff --git a/PKHeX.Core/Resources/text/ja/text_Forms_ja.txt b/PKHeX.Core/Resources/text/ja/text_Forms_ja.txt
index b7f757871..642b07403 100644
--- a/PKHeX.Core/Resources/text/ja/text_Forms_ja.txt
+++ b/PKHeX.Core/Resources/text/ja/text_Forms_ja.txt
@@ -847,6 +847,7 @@
 
 
 
+ハイなすがた
 
 
 
@@ -866,8 +867,7 @@
 
 
 
-
-
+ミルキィバニラ
 
 
 メガハガネール
diff --git a/PKHeX.Core/Resources/text/ko/text_Forms_ko.txt b/PKHeX.Core/Resources/text/ko/text_Forms_ko.txt
index cdcc08be89de890179f3079db5bbf66aa4c693e8..0e527a93e45c0076abe434f2c8e03b9955e85047 100644
GIT binary patch
delta 36
ucmV+<0NeliIFLE8_z(tI)pW;P)shYtksv?{0KBBo6ui)~e7Cbm5i$!l&kzCt

delta 15
WcmbPW`O9L%4}pmaF`Kgl)wlsV00tlc

diff --git a/PKHeX.Core/Resources/text/zh/text_Forms_zh.txt b/PKHeX.Core/Resources/text/zh/text_Forms_zh.txt
index b64b3e255aecd22d2e794c6aa0420c114b44cb05..f6b8bced133176ea880225c99d4e286e6fdee7b5 100644
GIT binary patch
delta 30
kcmexk)@Qz<L4f7PEaslc2E1V$Wsx(1z_WSt1%WkO0L3{Bvj6}9

delta 15
WcmeA(|6{hHL13an%;t9j3%CF{7zUsK