From 338dd153682c1a1b9ae6339f9738717936c08799 Mon Sep 17 00:00:00 2001
From: Skeli <sesyl.schweitzer@gmail.com>
Date: Mon, 26 Apr 2021 13:39:35 -0400
Subject: [PATCH 1/9] Update Sprites

---
 .../backspr/gBackShinySprite1015Kartana.png   | Bin 664 -> 559 bytes
 .../gBackShinySprite1023SandshrewA.png        | Bin 512 -> 598 bytes
 graphics/backspr/gBackShinySprite392Ralts.png | Bin 419 -> 419 bytes
 .../backspr/gBackShinySprite766Greninja.png   | Bin 560 -> 561 bytes
 .../backspr/gBackShinySprite769Fletchling.png | Bin 560 -> 562 bytes
 .../backspr/gBackShinySprite821Avalugg.png    | Bin 609 -> 608 bytes
 .../backspr/gBackShinySprite822Noibat.png     | Bin 516 -> 548 bytes
 .../backspr/gBackShinySprite826Zygarde.png    | Bin 735 -> 734 bytes
 .../backspr/gBackShinySprite837Zygarde10.png  | Bin 472 -> 575 bytes
 .../gBackShinySprite838ZygardeComplete.png    | Bin 571 -> 688 bytes
 graphics/frontspr/gFrontSprite1001KommoO.png  | Bin 1222 -> 1222 bytes
 graphics/frontspr/gFrontSprite1015Kartana.png | Bin 738 -> 550 bytes
 graphics/frontspr/gFrontSprite1022RaichuA.png | Bin 844 -> 828 bytes
 .../frontspr/gFrontSprite1023SandshrewA.png   | Bin 604 -> 555 bytes
 graphics/frontspr/gFrontSprite766Greninja.png | Bin 909 -> 776 bytes
 graphics/frontspr/gFrontSprite821Avalugg.png  | Bin 842 -> 865 bytes
 graphics/frontspr/gFrontSprite822Noibat.png   | Bin 683 -> 668 bytes
 .../frontspr/gFrontSprite837Zygarde10.png     | Bin 645 -> 672 bytes
 .../gFrontSprite838ZygardeComplete.png        | Bin 1250 -> 1214 bytes
 .../frontspr/gFrontSprite839Ashgreninja.png   | Bin 869 -> 874 bytes
 .../pokeicon/gIconSprite1040DeoxysAttack.png  | Bin 338 -> 405 bytes
 .../pokeicon/gIconSprite991MiniorShield.png   | Bin 332 -> 332 bytes
 22 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/graphics/backspr/gBackShinySprite1015Kartana.png b/graphics/backspr/gBackShinySprite1015Kartana.png
index 83edb7818439612a220e567f36d595dd453ffd47..9d5ca40ee76543a2fce35bef78b6fd1f192204d7 100644
GIT binary patch
delta 529
zcmV+s0`C2o1+N5<DSw&MrCex*5D*ZWr?z5basT}M)!^gL&(E%|t{xt97YtaNEEoKW
zMd4T;7&WJAXm>**?0o<L0lG;<K~#90?UFHXf<P3<fig6mJV;2oi6m`sgG(4XIY{gW
zki^XZ$$bFR1jp8f=-O`QKx~?{@oPEu3v}&qsJz3oPVMAdh=07_{oel_D$2S3x%&MR
zz-@K{(XwbLywLkSkr?FBBb+$M+9I%+M&L*|&L)i+dX|saqq{19Tt<tgfW>@ZAvF5M
z>FB#DV7+PHQ(Rh<ihOh^V2ZG(QOXseL{KV*E(4fCAI&8KrkGL675Z2ZsA#8HbD&s-
zqCmr_Vy<XaUw`*v0u2+BAcm~BK=Ii~-~<eb_kwB>Q4t4mthjrC--Vz^%{VY9J+25G
zVz~g|3KcBc5L61Q1!v$y0GL80aSP560lHDF)QZ83#20~AH8qI`ufkXhz{>InHc>qT
zJ8%nH*hzp9A+36bCjiUTN)bu1zgO740BmgDH|md~nSWgfe55wPUPriYxJKcyJ~+-5
z5Lk9nEF3SZ10yu_l>%JEyWc+OEAao&k@W$vl(iwSkpuNbtmJ@ky^A1Cpr{G<&~Fj2
zk6EGP5iFmY74jzSUo4(n`hrU2rX>Tk`GoI@@ZDl21Dtt#yQh&o%hx#9-_{T2J`er+
TIK7(y015yANkvXXu0mjff?E0f

delta 634
zcmV-=0)_pr1egVoDSw#IpooZoKuA#d`1rWMxOf-<5D*ZsFaSV6NWj3zkdTl702lxW
zFbD`p2pEV65MZ+4RD%Ej0wYO8K~#90?UXTV+%Oc!l?*134lzBlbUA3hK<XoVYjK~$
zfkXJ*9QPG69f!Lcr0&L6mrSM8B~zxhqo=C*06A;y5{xV9*?*3FPSd%if)j@S&%gJc
zEDoW6YPs&w)4)sb<Z0m59|7O9YV5i00Khiz+<UtV%&=8s&zlSY2m2cM(g^SXP>RVI
zJu9z4@Ccw3WAv@uB0Vz3)8QO5e|jiOd5!k{37!T+z!^<93fQ8V_h^pL*$b%vc{BP=
zj+~7F?%d;H9)IfXP)hkj{XPwIC)4|;0q%zRoL_*z0P=Ddm{WEE0ssbzh_Vy}0PHFV
zr!)gW1N0Sy@|^N_CMl&HC>%-|r)<#!Y=x6ks(`Dywt%fx9IT;3)q$#^fVu_LqXuFg
zm<lRoIbGIzl_mw?fad|6fmSp?1#w*kT0j%%Q4f)S?0*6GMnIEJ!T5(=Kne8uwTdk5
z0fiATo-|)V)mZg_%VxL)PD<Cvu6lrD8Z%vLg|1-(RS<DAU4l9VUs}Mu66l<oqXGr9
zfuE5nKsiqz6z?sd;7tx)YDGp<3;1jb@UBb!L1G(-SPXd!pgGIZ+YYFrbq;w4C`GvJ
zfMS)?wR6cy(A`^>E?S@}BFGbB-7B6gZW}<{aFaj04j1cO03bvd>i&rxBj+?;388>W
z2ticde_j2loP-Jx--X_yJRzt3eBZ;z9Z<yN4143gV1nO}uPs1E82hi$|Mj=6U)1PL
U?t1?8h5!Hn07*qoM6N<$f<k5@!2kdN

diff --git a/graphics/backspr/gBackShinySprite1023SandshrewA.png b/graphics/backspr/gBackShinySprite1023SandshrewA.png
index a8e6520e54e5eb31d17feb268a9bf0951711e19e..9b60fcffb2c0bf59ca844824110a16ddbade901f 100644
GIT binary patch
delta 568
zcmV-80>}M;1l9zQDSw&Lq*7RP5D*Y@fU=*p*}2>6DN~L9{{9S6f0?=A0CK<2)7X5b
z+E0Va4h{|v4-X!y@|OSr0pUqRK~#90?UO-{+b|48ZRY}2EEni5aSRmbsv615E@XZm
zAgGDicH094Im;~OQeAa!Q%XuCw;dm#=n$|Wh)<v7mt9qF@qa&u`drmYsm*)?V@Kwt
zH5*I=%L~JvM?Sm`5Hs6(>3G=y#>Wdwjc)O;12tbSJoBQVHUZ{&0r?F;&(ebf$l7;h
zceT`zuo@oD7uj=JibtAYv;Yrzcb5UxNrAJ{LO}N!=<a|8hafL$=#PH^JLx|FQl3Eg
zl*br3bva%yi+@~$vn@iGKkq<2Ct&w@y?kW?%jpT4Uj76+0puEZk<&Qg%Tor#wjdw?
zhid@5!9X7hU}Beb9ATEcD44x@dj6IbB4B~!viJ<_-@iQH6&kqE#1K-r1Frx6qbk6h
z0eu5J`a=Oc&Q%>#Q1%9BtN@amYmm;8AU+J@_8D-{?SCNwK0wL@(zIDZJ})=b8HjJG
zqBAg%BlKkm0ldQMgBV28QJ;r^CAn=v29C1rWiB0rqfQ$)G7$S~K@Zv_K!r*}`7s(D
zt4rgz5^Z?(dCX{H7#*Zz4KE)h%ycNgQBu-cI2yz!7;$SVd9kWZ6Hp}galKY(PA*y#
z3K@rER5APQ=j~lGF+8SCEny8br(|Mu+6_r=4ZOua5x)TPd7=7WZN?P<0000<MNUMn
GLSTYc=lQw-

delta 481
zcmV<70UrL=1b_sPDSw#IplEoA`1ts^z{uF>_?V!u5D*X$ICwa4kU)s20000000000
z0000000000006?NHf{g_0gFjQK~#90?UOxH#4rqnNdYw;$2kDQ1w4w=FBS*TWR;qo
zVBh};JS|ikK@WopH~OrfC+Y6)-+r$Rz4!2wziEhbfBeopwSRM-Pl1+ii1Bphk%<C@
zFnPe9`7~D|O8mNcKno#|S>bhYfgRx^fTff-4|uTO89^5D%lrgTW9)te)zDX@h&y!;
zP+pm)W<e-9z&*b*M98Q#QgeVapV&lLR?5Wz?peN6Xe8<YNtvsx$g!v<N67Qb(-WIc
zc}X5HF#I)Bj(@RSRGboCp3wsu%(1lQWEkPEWP<>(IZcj=QJRdDMY01VOJRcou+<|l
zz;7CWC~0E{;H#fvG+;h1+>pa{RbnQUjT|5rTNSh!0p#Pt4YXPXnTn`Pa;$Q=N`OZJ
zT;hBLG%4A43@TmJ*=fk6<~3mVq~2@3z>5$f<S04KOj?`Re>71K0fs(fQrhI2<DK;J
z#*d?{sIX}g(Txu4FjlBgLTV}?cDy&hJ6Ahf1)viyIOz>A?52=z(6A?K#J&B0`}_6*
X9*}pD!@Av>00000NkvXXu0mjf|3%ls

diff --git a/graphics/backspr/gBackShinySprite392Ralts.png b/graphics/backspr/gBackShinySprite392Ralts.png
index 3c0e71dfbc325a3eb5f66c2a2af3af0ff219742c..d290307778023770c020be3f08dd04641e0959c2 100644
GIT binary patch
delta 24
gcmZ3?yqI}H0B?1W;s2vi&zcSYpFR6yW2_q^0En*()&Kwi

delta 24
gcmZ3?yqI}H0B?ha$B&8$7d#5Q=Fd5}G1iR{0DH~~O#lD@

diff --git a/graphics/backspr/gBackShinySprite766Greninja.png b/graphics/backspr/gBackShinySprite766Greninja.png
index 6e7ef5337fc783a4f1aead13f37048d81ffaf5ce..c2878c0267f296442682bb8ee7bb6c5dacda96c8 100644
GIT binary patch
delta 499
zcmV<P0Sx}I1hE8=H7pPi5Gg4+s5nS~Fi7A?SQr=>Sh(;gC^-1|_~_`+s5nRf003-^
zTE+kX0lbl67k^+0Rl*VvgT#9j7SkmwnX>f(%9t%#{W6FpneG{SXU8UXLe;4gCm|90
z(|>0}lH^%`EzaW=mIseg$Aay`M;!~c&m#~Cwhtp@EZBY;5eNj+h_OI06EPA5W+Lu_
zKp0_x7X}0owucvN{U|~U`#1%3n*?O;K{zEwY)GuyUw=T&GcB|H0brWf^*5JI>wrk2
zh_=SM=oG*6bvz?QG;bJ@>V|V(&w)g)>PyyY6EqLnONQrcg$26_V47}AN-Z`9#QRAi
z%vIv2-OK~`gP@oP)M2R(B-YbwuwZ#AE0q~AnQ@_%Iu<2XcObBe_fHkT4SEul`ka8*
z{(LGCSbu@!E1Ch<NxXw2-7yTHwKFc082S`Z0M-e>3PZ+XVfLW|FCY{KR23AF_;A1+
zzwb>1bfRzqJm|{`Fahk=(TnTQ0bF&1cppR+15g8W$GzUcO<--kFoXDr0(Z^J*9xI*
z7c)p-o-IgmH*;^NaDqT(d*Ei{|4!K;Zd>YMt~}yJk3gfF)QFrB00%N3fbTh-q05u4
p8)6JFso|*t`njn`mptpg>IYZGyISoErYrye002ovPDHLkV1k_^*H!=k

delta 498
zcmV<O0S*4K1h52<H7saoQ26k;s5nS~Fi7A?Sg@#oSh(;gC^-1|_~_`+s5nRf008JV
zza{_x0lSf57k}Ud2@9UBu$V4c$&@$fP{wS@>bGD=LM+L2&(J$NHn9_`PMvxZ60tx1
zcQzzR{_D5JdA!2%;8E&WuuJ%;W5KR@1R}w%VT6nYyG|nlfnXXj76@h{MuNah#6u7W
zBP{U3fFQ#5@PcihMQC9kr+{vgfXqDzr^JX2iB<apsDF8;WtKkyO!K<_;<9NS5J?o#
z)>vnq;&;A{XQYVc4I@(BaL(&FkjPbi&RT7P=0SVT@SLr%;4%SB(``wq#m0bmKS_kS
zO8m5&dEkB!6!U;OEY+UGc6tpKERSWSG6N<vE|gM-qQvU<1Xl6>u>!b5Poh#E6Y$!f
zjwJ#skbiteGvGRjH8|28!T?%3;WCM#PZ0%R9RaK`WGohDA3E>?LSaBvK@o{}2h8#N
z-b6qr3MasWzN`Qfz-}G9xD6e^RX2$BAgUOE8lXGw?E&rrYv+X-#77jkYhJ!q2xYsN
zLHhD!L5jPXdpm^_1S;DDHyi(V$_8=YQ4ez!FFSe!8r`Hu<ct6~kof?7&*=<Zp6uKZ
oV}MBwPZiM5O+C8gzy7Me0WCh{Y7%mTCjbBd07*qoM6N<$f?izWNB{r;

diff --git a/graphics/backspr/gBackShinySprite769Fletchling.png b/graphics/backspr/gBackShinySprite769Fletchling.png
index 6488cbc60d3e004b474c5075230d4e12209de9a7..d04ac0e17736c44a2e7c13383b97d8d4680d648e 100644
GIT binary patch
delta 525
zcmV+o0`mQ^1hNE>Fn@DW2nYz(N+~EHAV@Gs&6E)M`1t?LLI1ruXiz}tz>u(zXdoaU
z00027pB;|?00F&8L_t(|ob8f9YU3~zhE+W7x}J8^t?2;_ZjyxwOcEU+V3e-9GFBkl
z!UQtRDdq^n5b$gY&Cd7)RaU0mxbH4~Pqt)7H<%&+LPq*O{eSOCGGk|*^$%zk1mEn$
zix~5xq5UP8hvDqX0vQ6?5V%2qK=`W>^W`AoLi<RVg>fGFau9LT`r)045HcIdKEecq
z;leZ_WiI=O3);*%pNHIR8WXUNYz4AOcTpc9<wkU~ug2#*FsTy)o;rGN{n;-Ah`p4%
zKg$-dKEJhqSAXo~Zr|3p?}6aj9(__2#XfTZer?b0tr5s0mYxC&vFvVJ$ZfHe0-wZ7
zN)#{40|7Gc&$<1M7n-pIlu}Kl)UhNW?MlQex{6%nN%f)BEBZ(s_#$1JCejfRE196L
z^q`IiSRdQagq$7$YN~>&`N?mjiTn`&$~FKTKoe<&z<*RJAk_<YDu0|Nv<^q@L+Juu
z9Mk#>bh>vch_rZuHz6K&#SikEg9G4m{D!we>nD|}Pl3w~0@eFQ1AnR47pH|W8dI1U
zAcoihF7ZVZsMjsfOq*v1VA&dLKt?ZLHHbzoz_K{Ti@;HT-3n*@5BdbZ#P)jW`oOaQ
P0000<MFvhpu0mjflce+l

delta 523
zcmV+m0`&c|1h52<Fn_o>2nYzskPs*!AV@GscxZU|`1t7fNYK#GXiz}tz>u(zXdoaU
z0001_gd_6+00Fy6L_t(|ob8c8YTG~*h9@Y>x=Ot1R^$Kz#r8rNYI_b~5aX<}5_$%2
z12wqx6g@%+26a=2cS0xVcqP(}`tFi9Bh5&j8?^XeNX-1-{D1GwJjO1%=pWEL2)@{b
z7cu5XL;E^dgyH;?1u_D%Auu9;K=|u1^I;HirF|mI#w3q?7(|R(KfE^)0<tmm5hfrE
zm!=7T9QueWb(nL$2)Q{lQNYHmM%q@okNOCJt>{*_#^*dRsZ#|!cl5&g^B)Ef2Y~(S
zss*giKU=^n4u7yev^5@jAh@$vpB6=N$XtNm*}Hoi0`iEZ=fF~|y4M!4D|R4gBwkXI
zcv&750C|7U-B)_hj3p?gY$_>Fr2^8fM7&l{k&8U3{!00qe4>tgnXXI|=~xkKNXVD^
zBTocapW4s_%ua~4szR#mEP5h;Ld3ESKnKu7S`jdl5`UHIB|DctNfWh?C+%bD0$v=e
z{Wt9N;8YN4@r>_6JnoBc%5RPiK;wA9_d@HtDpj8YH(LU#KU)p_RK31AElkLm;nV;z
z#tv{p6HTz*v_La!emMZkHdF&MHTkL`G;#r!#W6huef8h1aMAyu55L6rdhPqUUH||9
N07*qoL<FuvV1gI+?+5?@

diff --git a/graphics/backspr/gBackShinySprite821Avalugg.png b/graphics/backspr/gBackShinySprite821Avalugg.png
index 5b2bcdd5b05db603ddb5ec158ae5f3106337a41b..e79455e1acfdb3cd0f4d699a575c8df3b22cc907 100644
GIT binary patch
delta 578
zcmV-I0=@m=1mFaaDSw&Lq&it>Yp1^e005ra?a}o45D*Y+lT4Vpdh)tS|KX*Af;IpD
zbIHkU|HS|g4-Y0gr|AFy0qaRbK~#90?US)`n?MkT0eL2E?ktb0WQILFYR#b;7b2Mf
zmIrXeK8WN3S1#Q6eWcP!rBZZi<tjxwJwx`8k&pz`_KdgvKY#xHZ+Ee*&-x(M3%YgN
zSDm^eWhdas34HC;@1%Rv(O;5=4!{}Y_W-gLa3oCzvkpK~rqxtI8{iUM0tn@{>DM%o
z0Jpkj4E8ng3jo}fIoVf42@I!FK_g)Ii6RZtpDlpH-`@>p!^hxBGy$$8$_BX{ZvW17
z10XmbMSc$X_J3d80NBVn`EU#0x6caB0l%M8#v^iv56`0}V3Y)b=)()B{2qB!XZLU+
zz{OD<&Xq<qv${D7DESC@#X1gGbHw-ra0LAlTp$I8#ll0yqpkze<fkkFrM$3MY3`ux
z-~fnHCpIpDVwD`fVfQ^{m`Kp$O;Hr{BfzFN1Jns<#eaIC>wsC%PEX7coCEs?oXpcD
zuzaZjE*%U2BDmZXt8je)%!R!fjIab=7vo~N2kfhZ0W#o875wHNeg#x|mLe}8HozZ#
z=d$|us{n*NMb7{cEM6I~?4TaN7;r=^L#Q7HIB9@n_UkcVwy@a)l>w%id7}Y5;f}*o
zhb*OX2s>axBx2p$13|ho;2!2cz>69Bwzk3w_%g-1K?y{?wbiSD&w4lYAEZpU%EdQq
QdjJ3c07*qoM6N<$f*z3#-~a#s

delta 579
zcmV-J0=)g;1mOgbDSw#Ipg>?~fY8Wlq`jQg?r4xmXu!DD_Wzi;fDjN6U}$K#xM29e
z0QlgD`1o*8U}$Aczjgos0qjXcK~#90?bES}+dvQiP=S)dl|E)<j;&N^K&Vn71Q8eF
zkBDG!bw#-TV68%2kiNqlxJz;1-*DkZ1lHy_64=bjCtJ29)qgp-ZRcrbc4lQ+ALpH%
zNiiOGDlr<jl^O-Mn#1qW_?_||M(Qh)Faqp-k^-nfU@MyM;}M`JlVT=d2zW%V09trM
z@f(^efLsoY!MP#60f09!C+CGIgy~EP=mpM>D3UPyIRI?_{%#*nzZO4qAMg}WwolY_
z{T$04pt(Pas(%EM^)J5%ILL9TAcw!}djZ#=+69#Hh`i~S`$ZpEghioukbp>1<WXI{
zhff+jT=-=yB%+zs*)Fu=N5CtVez}Pe{R?1g`mXta(pc81i-Jep1<LeKSqMV7WxbJH
zK{&+;=q65_xB>MhJio)?d&)3WAoEpS*YO!}=q&-t5PziLcrClYEa(sq%_F!5#{%4$
zD;uy)I>4h-0)Pl!SM{b`o`88_ZwVIIfTuLCw@2W-oDv`dSBc^q*Qi?1#<Ku<0lopZ
ze9vwB@3##Q@)TVIB1oSYSWeMxz$D-nv1vj)8gNkn$?Vr<V79P2f;IsLnYp6@uJ-cs
zGD8+nGdu(^O@w+mIf5cMB;Xq6fq?5X`m?mk7JQyzH$elU$<ms%;N$!^=N}AfF&ttu
Rh9Lj|002ovPDHLkV1h9v5L5sF

diff --git a/graphics/backspr/gBackShinySprite822Noibat.png b/graphics/backspr/gBackShinySprite822Noibat.png
index ba05575dae6b0fb48576ae4a5f413f7f0eb61e1a..94b212f3f41fd824c3dff53a32048ae72563e1f7 100644
GIT binary patch
delta 517
zcmV+g0{Z=g1f&FzDSw&Lq$y%r5D*Z9)zugn7ytkOIWak6q?B4tT1rwuF)=A1Cm4%*
z0RPwk{{H?C4-b;JoV@@50k26!K~#90-IBj<!Y~lVJ&=h7hKQk0QDx}TAp@-#i7JQ6
zti;NiA@U2*DzCxd#VlPA5}mtu>HGA~#uV^{Kke3=B7eVp-+$fNj9p#)9FULy3>2sJ
zNd5xoqz8ZunuuoU89?q46u@#h+xsS(fWzTQ0BmLY1MI#JEM`M{+<66HP64u+W6TJE
zvI#68qk#fqglI!pln6AbO#mXW$gSSYJE&6`&+f<O(E>8e$lbXI$`+vXfDAGmAYWt~
z5V`Zh1Lg6$uYU%@3(GG9WZnuy7XrJC;W2QWF%E#O1$V^$J3p`}jLyjx&;stE5XKQ<
z0@Q<)pj(3XD1h<8*wXx|B7v@OfLSMZq{Vcrn`M%a7GSV+fJ$zuHX~y;TR`1Yz`M~d
z;%1<#Pdb95&Id}>Uu1$YILJiNfFIK679jG(A_L-so_@j>>WZ48E4WXffsHmC7r`?c
z=;H4y+|ydAsz*53Ca0K@)it5JF_r?Zdy&NyfEik7=yb)X9vL<`sfC&HH%f*VC2$9^
z(6r207TYD%q&@c7=UU(n`fUb%A+*s0dIx9_`<tNO^uMleXZ9~x$*2)%00000NkvXX
Hu0mjfa=7t+

delta 485
zcmV<B0UG|K1cU^TDSvRlpa2jUI8a~!000;$I7oniNKin4(9j@ANQig<`1ttv*Z?Rn
zAQ%`B00000002QUliUCR0gp*UK~#90-PAE|!Y~vDU?b0!0__EGdjM1$iNOpczCmQc
zMJjbfiYhVmR$k3ip)TbveYO({_`Lw_R!>p<@&C_B1Y<WZd4CD0$)7>hzt7Dtz@Rt*
zCL4k;iVMIT2@Ei07Dv~}5O8zY3n11MKj3hE60sP@+k+<nV+<HE4mBeHrN|<nL%;$t
z3REBwWdNdx4Ir`z75Bw>5caW-=k!DI5P``%RJz}Rk^p4~OxBTrc{CK@>3-FL^89h%
z4DuJIt^-DqfPY^J4jsdDaNaS=KpP>GIR4I0A}a3`Izotm_fTn{MBV`F-Wb@Ag7}Y+
zm5<9wG=Q-?oxpav!ol3P>+@xef-qqOyCn{|_o-xO@s52P0N|CXkns@K)<i?>a2D1C
z4@jrn5rB6>5+HT-R6s<S(N8TgB;(G@ubxxHDL+8$iC%_Q%>A^U;vfyV)lxe=Ae_@_
zc;1d^;O}sRTKhS%&t&8M%r;a3W3xtwr&Ln`e50L~Z`N+8fK3>1X6<TC1T^tYKm_s4
b{^#`#Q=0EbO6N_>00000NkvXXu0mjfJ}}jZ

diff --git a/graphics/backspr/gBackShinySprite826Zygarde.png b/graphics/backspr/gBackShinySprite826Zygarde.png
index 948c8a6b89a0d299ea6c48545f20d2c439abef8c..17f8733c5ee377b986c05f30531c814944b0a07d 100644
GIT binary patch
delta 404
zcmV;F0c-x>1>OaaF9z=J?zFwVku@X;Ml|YS0007Mv0(`TfA(_uXGa+V^!=fyikf}g
z0cRN5E`czUAdTNGUZ~H&88!l?UfNJaU=yrcdgUxQhcP))Rry8$grGsrqbyWe3II@s
zmzV)Z)3DAtqg)3-NyY`FKFTP)@mg;p@TR#gL0g2<cmzt<YX;62H(;&O&MNN<ZxFZ(
z&3nI)4B3Izf2u%$0?)klJYHiF^EFjr4F(XvBNebZB$APFqe}wbm}0dnBiP3x_`>2A
zu>t{3!2BrPzGTNY>;<llRnlV<S1|RV2e1UHvIh#YjetKZF!T;J0)GPh>ie}y>{P*k
zThReucdgpcF&f!Cf<kI&BjDqJlHQ0f8UdBxMqm}Ub~Y}7g`ACmu2mOMAn!6Ld>dG_
zu}Tug`ECgU=T?e%O*&!ybud^+#`Oc3oo~PwI1wnM2a;La6AQX4fiilZP+wG@ZgjW@
ypAL6`E>mc$9;i>D59G>+a0A=Z={yAg$@mN5J=ijEO|i)U0000<MNUMnLSTYbc(U&R

delta 405
zcmV;G0c!r<1>XgbF9z7);FzGGku@X;2e`_h0007Nv0(`Tf3!+3|LiD3fWANUR8g~!
zJKzi>+a(ZY5~T6F#S8TrIKxJu)Jq$x2yB9NORt;-=P)Kmsw&?IfDkmud6b1JO924N
z@DelNXd2czXO!yzD9N~h)JGYmH(u*a1l}~)C1{IK8jnEfdd<N3;s&f$+F9j&;SB<J
zp?U8Yk|8^=e_9m?P~e%jp2uq}V!oy-tib>Rc%%YWheR?mZgfe&8&j-yWd!?J1YcO(
zB32;4378+H+n4P4hP}Ymu}XSu;tHld^Z=GXRrWw(wh{1W1%}?CM&M6?Uwyw;iJdAK
za4S0C>#kKBIz}U#M^H!&Z3KKAP|_RmMI)f{+X$@Uch<%wu#mG6(6#CU3gle|g>M6k
zHdaZ(INvQn;M__PuSqAYzYYcq$+&(1v-1u30w)56^guFedtyO%B~V816Y7h~(~S=I
z;M3s_&}9m3)dTe@^nqOY5N=?5I-Q5$KN)`k;XT+gv0xWP00000NkvXXu0mjf>d~~E

diff --git a/graphics/backspr/gBackShinySprite837Zygarde10.png b/graphics/backspr/gBackShinySprite837Zygarde10.png
index 782993aa02e52636ace5d7c4adbb18e062cff22f..6bdca1f79b66bbaf981e1e7bd7d13eb4e8fa3d17 100644
GIT binary patch
delta 545
zcmV++0^a@D1HS~2DSw&Lq!17g4@W#JwU8KsaB6aLvbwtH@9+2gu+!6;!Z0)JNKFh3
z3=Itp4h{|v4-fj3@i71Z0m?~4K~#90<<wD*f-n#UVA#ZWs=~7(7tp!~0OkPr0Q<Tm
zIAk9;S?CEi*(2<6ccv|BY;h0ZBqmM!QT`4{5Ikpvb>*F<vVTK0)E=Oy4B??GG@u3A
zJw%@f5w#emp_3y)#9jj)&HyHr8M+|WKrisHA3Px@pocCHLW7~20aQ#VX0;F^LDhJK
z$v-qowG`JUIG$2;+D|?*y1?9>+B7Bv)Vm8B0&f>EdUD1FU_7<eJ?)7v#WtoeQ29<G
zcmu>X>A&R02Y*7nj(D!eUEu|2s~>+34*`z9-)3r=-h$);)Q1HtnQnZbE3vXb9yVTJ
z=htv6t^lBv`$&UZaSNb)Z8`Un?cokI3;<60WFmvo0UhKSKyGG5W<eSxC!t^9q=PJ9
z!Zw(M<Ziskly)oV-8<6`R3e(fuO)Y5ClBQjph&RAE`Jwdx&ybfq?4rdlLSb_$QNHX
z2too<Lb=xfwnE%Lql}ty%-6Zprz@i1z65mxqHtvZxPZHn^MjcMCerHo0Pr^QKS1$K
zni(MYQMA;}IbgpdI<K!5jeVA4I|HVd<$T{rTTQR5IQci|`G0B3o3c@lLES$Fdi?@g
j=l-?%S{maVc=q}O#uMOo;rT%U00000NkvXXu0mjfZs+u+

delta 441
zcmV;q0Y?761lR+RDSx0ypa1{>;NalEz`)?(;Q09X0GOBnaBu)vSjaFi@K89QNT9&L
zzyMfS00000006_L*3bX|0b@x-K~#90&D6be!ypU*VDknBF3FO`%3bFgJxLzH3)i7b
zmU!-?^$|Mtbt--w>>%Om(ko;1MMyHxb$_&!ZpXEOB2-@kbAQ1i%uox1_z=oLEdp2s
z0T@_-&@TX<Q>aS-ZVzC}Y@yym*&UFD(;~<sHo_LM779r)qgR-P(P0xt*es|5$BG2d
zQZ%HfMcQMeW)i5UwE#?e)V*q(ffE3oD=Hz56nQ{NFpndoU=B{+hRUR7;lP1q8bKVc
zEdbgK=T9a_0)Md!@SYJ{@GcHK#9zGklK|{4a64ecSV9Ysc+>jyB^5~%g^%y~Cbbzz
zSarOkU#+8iBs~~vp68nZ9EErU^JL()3H-!doE5lxFF#qQ1nT*$0Xx9ofO`w%8htMU
z8l-Q5@Fnz71}YxM;kW}xNWkXf%3ivXfPKR@2_#SwurfD)oqz|b#Cc#J8}LAt|MOMa
jb)0*vH*xt){?GLT95Q^PE%FPb00000NkvXXu0mjfSbD?u

diff --git a/graphics/backspr/gBackShinySprite838ZygardeComplete.png b/graphics/backspr/gBackShinySprite838ZygardeComplete.png
index c2f9cbe97dcd77d31f91bd82f817b4606082fa3e..2a99b10c4e09ee6092c965ee31277d7c8ebfb205 100644
GIT binary patch
delta 659
zcmV;E0&M-e1h55=DSw&Lq-t_<5D*aHMM{$v9C~_AvbwtN?(PpqJS(-37=mzHlI8dO
zu+!6;I7*rKk|*)2F#P}k0y{}WK~#90wbZeS+%OOTP;0-yBf?x4EC-bCs{BC0{fJbI
zQ!Qu<yEq7>Igb01kTOk*gZ-B@*<!)pkdb72C9ib{2@$(sJb#bT%xJY$^*5`2B`(a?
z%j6kpBLy}~VnJlC_rXTk=@A&zm2mkE)S#U!U|=g8>NPM;%oTv>hb)CKmLd=o0QN(l
zroaX4h>*|{gEWOki&#&<7_u~U8Bk>Tt>1wGr(n=$z`s%++(`0^!O$f@5K4LvO(h1q
zfV7PrX$Cw^(SH|!VPKpLTNMC@oUL>jaL7?x0@?$*;rWyRXhmG5E&^%!koAFH2F8}a
zj--{`#y<cP02Pb$0Jsfq1>_bG6KDapfet|Ok3tmyFyJ@`CScY;a|C^)jiAGhL7f2|
zBGg8p8T1*L;v_F%xjF(F&<kK^5@25ixDCt<Fao3%Ab*T;pjfTTfusp=q6iKt01x6G
zn1T7fN{9JkOppS11#kh5x(#5GLEst~%7MO|7I)ch09sD#0&oR}1t{&KCOwQ~ln{ZL
zhdKAz&4bVo08jY}xD1#KxD?1Rh#Z6}-Be>4)Zx~wK+;ASga8lp8pJA_sYc>k!_5K~
zKucEgwSQFny@1dL%z#=2EibiP-+id^z$Lu-=*M6}P|0=%;|b~H!R|u<d~H?Ogwx=D
zWN<u;N8cv{2?0D1ef1rI9>?D_KD)Qi!<VLlJCJ;_AJyk?#GeZ|pKi~m`(M?&JNP7l
tp7hiA2mVk5<9-~EF#bIMsQ&-@154S@9aVzftPB7E002ovPDHLkV1m6bD;59%

delta 541
zcmV+&0^<F!1-k^0DSy!TxOjMYARr*Hu(06Z;8<8#ILNpNXkfUou=x1+2$+b_7ywX+
z*f>zAh!7BH_~_)}A5s7S0mey0K~#90wbhG}gCGzFV22LS281;Yu%rQo3X-w^R&I9%
z1;m(}n{yH!@e}^V*D%O34}%@@qUO9h7CH)h3pfU$Jg#u2-+#Wt02*Kw<`zJ<5X&)?
z3*Zw_0u;p1f@M3!5O4#WfOA`)N)rGI+5%j*7NZ?HoB<cxfEc9<2EZUxJy-%E0knt#
zu^u9L3MEYh@C;xFN`C-LoYfsLR)7!aJ7A1Kj~_s^cfc&>KLLhFDfI=Qo8@a@K7nXV
z35t8}8$fp)&41J#2!99GBoF~RfI1la06Z|DgZdiKU94|_IRJKnPGHI){1V6r;{l4R
zrD#6^xB!8kwi<*6&=V~q@a8K}Ukn-I1d54(8t60d7hr$y`S}E@nF4Re22>NFkb%qt
z$mR?p1IHZ**e4>Tq$*VpU;)f_2o6xzNmUAPyxKug27gt#oy`AzDvOjS(3HVNxDMDu
za1kAFq*T5Fd8R4=PMZ?cDJdg(GfoXSQqtE8q8W7uZ0~Cb6jO8i$QSegDFhe6z$GB-
zoYFI(B0POXoZXfKNC*a;al*&?TGz+A64^iw!5IbM>-~JZ@%d^2MTll{ZvoW4=9Cg5
f488@=8W#Kj1n&k?e$@RT00000NkvXXu0mjfC_Lbf

diff --git a/graphics/frontspr/gFrontSprite1001KommoO.png b/graphics/frontspr/gFrontSprite1001KommoO.png
index 682162e626c451fa2a07446b4185527ee155a31b..192d8f1ac3e0ea457a7c592e77f458ba0dccd5bd 100644
GIT binary patch
delta 1130
zcmV-w1eN>73C0PKYk%8j7{_0|r$8>2Uu_<gf&56tNsU(QS4~cZ+J1XVcUhx<U_0b&
zcl3n`)3QswKnU!zxTA;mlEh_@WC4!}vrCWL!P-D9-b??6_0*oSN0Oz=!IZrhOMXA^
z^L(FQuL$|SOVi6A-e;ZW2LZ;f0=m9npd&i1#eX<26%7dP+JC&YV3HS1YWKZP(^xpe
zb{-S~&lA_%9p1>jXd6-%fR8+{<!u9R<u<fUDfLX}V+6LD=h*;O>ph_JxzCjY1a!;u
zn!H4-dIog45NYTuPlHqaI01A*<3pPM$zZ_lsaGNaz8fC;pRNCVce~l>lt}Ev5bfdc
zrBeUQfgdEUuYcW6v&tKUq7`vZtsj0fLBLFaL+Q()i-~E+aawn%_(O&3(pRrqsmMba
z!Ax2F`nH8Stp>4wS1g2a0Cp<{f@q?G5KyMY8x-9@^|lIE<+(_Gj3=`Ylwv7BAWpPW
zp*Hd709Bz$5x_Xg+(;{dfUy;wx6`aRCefTQ<h-f_zkid|TB)`W6Th0Ko)YqDXx9P0
z(97r}20s7G7NYKpc2=&6`m?Ux@~Y)d3b-N$avy|zEO}jXx51=|EX<`Q+Q#_I%mB)p
z>cryNI|Y+K6-DG7Q2{49DFZ1ktpI4)KhihcwLy`9)kR>;`1)}0xInDRlljvrwx}E%
zt}`5dzkd{nEM9x`tOxzk3v(H;+HFJh=$X7wNA+MSFm*e%*Td-Vr^kCLC<1ePd(Sy{
zULXH7JUISQ%9GWA1Sbo??hC7_X76@~2LMv~V;RUKz;O=PZTs5!J2*b*O%U)SCHrV&
z@T5Nnz!0`BfUO<KdL(Od1~QENmC=(tQB>H5A%EB=NC#k3b_tj@`Rh^C%QIOIV*n@C
z!S0n`mEwA>?a43)wp6txT72iBqp-91wUfc_XisJuu?M#l2wmt{^qB(QkpAds5XpWH
z7!zgMB4B#OnJEP|DSyH91rLA#b*3COOt7I*i;w#%GoZ1pen{x-Gy!Bk#9v<_m@5!t
zw0}m`l<&xTd=kTHOmJE<1MXI=*TLD@=mjxgbKdB`Z&=M8r@)l)<}3z6#w&7`7qyIL
zF=dWojj|KFxG*W~$UMz@Yyg29u>_zAK&%~^HA|u(P8ofU(U}y}Gg<(ca1sOfw3$k|
zcnQS9=SB*Mx{~rN$;PI9XcBs3^xLILH-9ofYsyOG$1}<>`rezkjF$-T?5@_@5tgPM
zPc-B5%Qx|VH!t51E4%Hn(7fWCBw%<`^P4$9*?f|<$r;qTC9TU{Plptsmx-r&8YYq6
zWhFM{cRlZZ23+Q8#sr==m|-%;y%;c;01sNOZ9)QcmH~8HanYR>1I=WEt_}7J0AqoP
zj<2Wu7Jj!932XcNgCaoi-lEXMUQVOb_usx<1Y(BcIPfxFU06JQpnprQE`T$Dq<pNw
w|8<vq$F1A5w26Vata;T#>;wQZV^G-t51Ev-;@FWwQvd(}07*qoM6N<$g07!0_W%F@

delta 1130
zcmV-w1eN>73C0PKYkwO@6vt=hWbj3+QL92Itln;r9kC74Z0u7Yk|rmom&W@Kv<IK1
zlnitc3B5!$7(*_#TyjV*wiODpYf$MTddaapXj@onb;#e)oRX9Kc2~Pu84)rU?P@;r
z-uL~QCFEn5rWZfF&)SU-0*qe;bbY}<TeO>t|8QQ&8xY*Fcz<)jB+r@D?z`<qY2ggp
zd5{NOS6pwkc|G%@ZAh5|K5^ZqyA8aV+0Ztn)Ki_05!hy~YXO+e_khmlK35J9&`sBE
z@B*#qDbV3UB%!Yy`ltF~4CsVLhcx}OexKb_uS5*|FgWtQc>2rT?MA&_Ad!=jXblE0
zmHKxM{3vmK>wmNx6<#M4t%!SS{ph<10!9oRNl*G6OiU|^)4W5)pDI|Fo_f_xL>|cy
zX3FH(w@uV()`|6pVgZbOu$l?rhZE%ofHF;9r|1SMw^gtz&qd;6JedWc6iWaCQKFR!
zw23zds0s{<0LD?|rKA!Fl(xe2R+1IlAetQnoL6+<cYoqqE7cNW;#HE=Q$juutQx>q
zdJ%m@z?XkpLexCbO3PJNf7P^GZl%~x07pbX=7W$=C9i4DHW)OPg}Ky3t290{Qh@S?
z8kszOr(h7Mpopv^%3z11B9Q#ja)5^YBfXNd*3T2Lx(JLJUmx@z=ZIA~nm?Uli^_4y
zu?K^vOMijT<kd&dy3iZGFqQ$Uofd?Tp2-V!T=SO#Q>R^hJqZ6fJlRuz9+=zPd(OH2
z`sC-q!O2fjj#ho*j~0O47iL4v-t7(!0HpNB(wA|7;|#D`*0u9@aB|R{AmD{c_RvQE
zNpB87Nm#l7wss(Ep{&Xo$RPAqhEK9YQDK!zf`4s-v;j6{hk#L)za59&ER(e$0&rq&
z>|XgzA*$Efo(wWzOI4bp$#)*w3OkEm8})aGdotCCJ-DSn=t9S$&lK>w^oGa%Q1&vQ
zG*N~ne5RM}nNm=d@>e{c^8g4?d&*J61REN)c(|`p0~*`v1%%E{V?g!-{Ph%qnF29J
zYkyQt`HrkbCo!D*1g9l6;A};DZJeErt{(vw=k?zEhSi*L0!$fi%pxFQyewx~QHy96
zQ)VkxFWQld3xmRr%+jn!1`xOrNdOuH#N3f-v&0Ibl+ouHok1}@!v%l|J2rq%n~9W*
zmq1K>t|x$~DJjq5Y;4Mh2B9~Gzh4@3BYy?7hAf9(G@}fo@4ku3c!>Z{?`o|TVrg2@
zL^CeGeiQw7^YRTb)7u^k&C8xae1<nQznKA)%_mu#oI$ly&^p|4bw~hu8GD+iVG`;c
zR$x<p*LClwz-5+ZOyFsql?=wX8v(`=;6c-|42XgDGJsCY4!ScVpb>A-wf=q%AY(Am
z@%5D7!tYirVQqiEp9cuuTNJw3%Sn{_{@b^UK*Vqy2VTUh3yY`s_3z2m1#kv1ic41K
w|2a#(<L2#I(!{_V*0|~+asmLUG05%z5AZv+JdHAUYXATM07*qoM6N<$f*va&7ytkO

diff --git a/graphics/frontspr/gFrontSprite1015Kartana.png b/graphics/frontspr/gFrontSprite1015Kartana.png
index a12ccfc54f7591ba6262da0997c950f7a8182f49..eb052a957d9f6a41bf577d5d72b41d8556afc436 100644
GIT binary patch
delta 520
zcmV+j0{8vm1*Qa$DSw&MrKoHi5D*aLpF?6~asT}M|J6Fr&(E%|uEoX0YG`+xEEoKW
zMd4T;_V)H_YIDYMMIZnG0kKI$K~#90?UFxF!cY{&OY<hW*j8bEZKw>yp*HD^ghmD#
zAbkac3pR9zgkVTqObC1dCl@toOgb6kLSQm%md#1Rcd>m1wSV*vlarj`y_cNdJ@>Y`
z1hLb9R(^{Qs`yImh1(MXbnt_1h7f?D?1=(#fGjnGfRLwb`xFDLZonXrRj0OHn79GD
z%n+cs36R2>J?q#Gk&-V7ps0ZeGBbNUT7JTW-h@CwL4bNI-Q<=gWM$V!`QIMx9@Du}
zPv=ZdWL)0|B!3K-n9dF=sDI9SzOMr-IRs^YRHRzJB4%74Reb@5Br}vHAUSO^``Gu7
zz;lL9GlJDd?FaD?`)K1&@tj06w^pxT!M@7#fsb?$hoDm}O)K#J@}j2`+L0(7bKGXF
zHx$w|O&7(DVl04GYB4-Lz7GQHh$ff3SdK#yya?3|H-G1$fD@s5y_0v=<8uf=u18Bg
zq1qyh_-R%eUBAZwrC|o4MO;9GNA+$#8W=R7FpL3|t1<-HZg3mFfnFIBWE@a?aZbU%
zEJ1)AMFOCXEg`Z87(n+Tqk+{X3eiJ&013AM(b@`tE&fh_s4uTRbgna!iUR-u002ov
KPDHLkU;%<{dg;*s

delta 709
zcmV;$0y_Ps1mXpdDSw#IpooZoKuA#d`1rWMxTrWN5D*aPXaJB{F!0DY(1<`dI5=={
zaG;=|;Nak}xUeC~5BdNA0&Ph|K~#90wbU_h+CUTsaN80V14E3hO5Lj1auqgs782PY
z2U433?Eo37O0LwJg4zs`z-y)oG7>4`ytP#j+|;U-I%VzBlz)+>V(x(I&(O1>@dbQ%
zY2N}m|NOsq=hF$o|0(fa5-21^s7VoOQiKQz5s4sqj;%n+QV=_bs4U;E@S2cdM-U#1
z5CS_E<b_m6v}yq;^wPa`AS2j0a-Uds2ylPcJ6#hFD!8s%3)+FAhsSswP|>`v*&%>E
zZ{kIbq)$Vfa(^ndS~pw@<i>auJ?{^P!S9i)qh^P`m)0TICs9Cuh$l26<(@$0PQ5_~
zbTA1MfHCoC#8)?G?0tAy|0sJpw8u;beT*kG;`<2<JSaZ>*&1Y_?J(U_;gJhr`Wf!3
z09P|?WPyE7_lSy#Jzead576Pf?HOg=7B<91#{UEljen~dd5_BG#y+<&dF?L_f&gN~
z06}h(w^RQM3IkBt-T+jL9e;5+pE)lOs{I`ml~sk}?D+Q^I)lal9aa?(`PFFFot?i!
z2;Iye!A&XIUGuEjY2_6SF`J-A;z6n8G%r1cnCvDo5f&n3LU3t+B(SBk38Utv<2bjM
z7)2CJ=YRNDeg18I{mY2m@Wl)T8(SoqG<DTh#(%a6*vj}n=FT=CT|c_6Z;6of1AuCm
z4-AygTd2VgpdW#Ls491k;L|==6pag1uo`sVP>}~Ts8V2U0p$(_hzmrk?AmlCDE4|;
zf^N7JE`abX8(g45cvK|>oF=r@Q8jo#U5!f|5I)_FMs(`qLHso;h{a7B+rsU?EU*&*
rbEk;0KxW$E?Pc6_@g*lb|CjX#aG=A=c2Y|x00000NkvXXu0mjf^npjM

diff --git a/graphics/frontspr/gFrontSprite1022RaichuA.png b/graphics/frontspr/gFrontSprite1022RaichuA.png
index b1991227fbed8d3821286f7a192b40b6f895ee5b..0a3060c3640614c4a55f093e6e9b68cbb2e0f9f8 100644
GIT binary patch
delta 797
zcmV+&1LFM52D}E4EPso0AolKB5D*Z(q(P8sF_<_YYA6WaltHX&F%Uq2`1trzi?o1f
zSm@ZW00007Zlz@a00PHJL_t(|oQ;)1YZE~f$G0rFC!xCrZ$0E?!AK~yorn}sNHWC)
z=}AMc^%A!iDFjX9u_@`S2QQK6D)ivZdJ8#-L;V1rN)KMbdVf$4N^n1eZ)P{$Y<5z8
zmkjy;@_%pMOx|ePY%DCMzDnv=>0-dLD;FEUKL88p{{jo9X(}_&j$D}*0IaBhs&p^`
zlz;{HK}CXdfDBLxSW?fWYba7mS0V$uuGmimSW>U2GiW-cQ3kr90DNDktwv)TGuY^G
ze^$TD3x10+)_;8nPzKmY8JraccbSL|0yd;e9DT3tg+LkXvYjsRPVJS{nOg+qq3T}y
zeMs~&w4~Uhw*KrBiwL69HRJgg6yKmtM<pZRzC+-{@q8f94jp!kHr=^^NO2wap)5hu
z_Sg>VG6r*jHgg~Cv3<yUGe8SN=6Ee~q=8l)LlA~134d@K+lkuhO+ttu+DAdusqX0%
z@I)Rwsqbp-Ac%;A&1qm)evmEWXw3Pq5E!0LWr!-e@f3CbSpxff3fPJky2C|Cpv>bO
z#^ml@dLaSK;T#ML%jbYT0i3rJ;P55C_eTLpoqxm(YvaL>7>H^xSPb;O{fv95KM2=`
z8v`C8Q-6K1!nvl$fSWvvwQLA@<9PrqhCncmcH#A=b^No37VD3Lfb&2YBmo^jjw_>&
zXBGTLefGYrfh`Dqr-`~JA_aiG<To78BR8d<%ph|tk9d{gFLjlHuo(F;l*O+r41~pP
zegbm$Xwg^P`C^Wbc&%qHBG4x(dBN1_D(BaVw10HfQB;7PGK&;1Hub+cOa<WBGc!0L
zeLfUjR7`oCd)W-#<Y$Gd>lNiJO<5pOIpKr6*P|*R9L~4+XebP>q>Bj0du53any9bf
zzGfdsy(|er#5gbEbCaF5Se1m0GA*m$ijX)DMKcmay4@HgGm&#j9V-oyoO;Yg2*!L_
b6&8O1ASg-oBB1Wx00000NkvXXu0mjf!Ov^N

delta 813
zcmV+|1JeAw2FwPKEPr5NAo%b=5D*aPxDb$7AecBHU?>pah$ygFAP_)+`1tr3aL9mY
zSm@ZW0001I*&&1g00P%ZL_t(|oPCusPuoBkhA+AyQzhc$59I2BDk@4iM-@YnavUlP
zEMR4Cr3g0E7P)k6rS?)Jq{^t|sKgH4SX$L0KcEvkA_H`22Y>t<`kn2I9sAsGu$+6J
zd%xFb=MJHgs?_ERL)npvMIPpX#pYaAHvptLy$9U{5N%N*C4jb22CMBtNR|aw-2#BO
zbPwoYa|5uN0T@}y>j>LAghk-C2p~&^7z_pquvwu4JO(2@PY5xvj2)l{vz0DHgD~4*
zfROWS6ak+(uYa3#g!j)tJ~<oKsZmGh?N0!{os0J+diB#U0M6lJOaQ>}`NwT>@~9Me
zDa5w;A_Nh;CBVG+;ElvPGG7t`09F41L|jDp=;q24a+DC#pIodL<eRIijEJF>$3d`=
zw|LMRU+v4JUbjp@@O?*)!cZB=*2P9U2Vi!wwgY-Z$bXISE*}AhzlA(hz#jlum^VOZ
zd0s>YVF<uc;a>s3+VC_6RF9$o!t(fF907l&^ou$|OYrpL7&tZ<fW?~tDo$wx&~gyO
zNFJzqp0}F<!B`AuGF10m*X?^*K+FJpo0QV7>*2!`$bJyjzG{f6`>F)kO9IhNGf?g8
zJ1UGBs(+i)br>bU50PC--9fGO*94Ge04<${(L%wy@^RY)Nd2y4+ff@twE1>Z0Lwx0
zIY`PCU^VlAd_n0G)xl9fCEBynr%*lATY{_46<|dG?q>l%HgY(xsok(yNa?FZkASw?
z@gtzypJ{=e6$SJ<4ZUw-*V7@72&WEr2={rd!GD<EdAn|W{NSf7T)5-wx8cGH=iIh6
zfL+$CL0OaA;QEeVx5j{RmO3E1MWUKq2A2R_D~!SX^a!F%1NV#e1OO)<NY5zRP`@9C
zlMWn3llxBWI6b0Nj*gmBr)rpLJvE3-I*jCM4$T&g8}%BA-b01L@cnnDdfp(eTB6(a
rwkAog)b#X{1HsX<ae5L0DkJ{`8U=N8!>UfV00000NkvXXu0mjfE{1&M

diff --git a/graphics/frontspr/gFrontSprite1023SandshrewA.png b/graphics/frontspr/gFrontSprite1023SandshrewA.png
index 3671c3e3a18eda774b08751787fb09e459d065f7..5b5f5128806949075f715f7e45af20d799a4994d 100644
GIT binary patch
delta 525
zcmV+o0`mRb1giv)DSw&Lq*7RP5D*Y@fU=*p*}2>6dT@UJ{{9S6fAa3E0CK<2)7aI=
zp}DB54h{|v4-Xm#)sz4L0k%m*K~#90?UFH0!!Q(vliVOp%LEd26JVfA?Hqvk8Ccu;
z3FZnFF|Z(7xBvq;0Ev--6R<GBY!+DSyYP~N5Q)u>#J_m>KY#sxzn_EPUw=|Oj(_(r
z5Pu=U<QzbuKO}4K%}^_)*F8X2a?Z8J9WTI3p@@AzA~b5Aj|(5rKF~;n%6&iw2|$_W
zg$HO|QAswWJ3PSFIqLnhE+6}95P*l5St7v`F}X+Ff9NMtf;-~m8sLW69)NHIE4QTA
zH!DC6Tz)hn|9|eSZ{t`xhsb8zmCrT0??`7OL;m{(?Xv>H+6@YJSl`;57NTVdbbiJ}
z5{H)5Rs<w8Wr#H(CtzV>REVNml&h%$0;g-{c}@TfpcTZ8pOwP#s(G2>7$DO{OlJ*<
zHs;&LY#vEqfQ3ZSc&!#&7{f?80#7+KfX*%fhKi_}f`3#rHWp!Fjd`{9U7>;=cL3sa
zQ3g~%+T2H^Mc-CWm7^#?)&r;~ADmWz00LOU59p_`lIRKG%;5)7w+&^>R5l0v?5Qgw
z0?)4vACHzshAlU6e6~#POh-;2U`s!oKTX`gSJM2+J>z$htK+}^ggyY?Ym~H_pJbQ-
P0000<MFvhpu0mjfG$8LW

delta 574
zcmV-E0>S;O1l$CWDSw#Ipjc>#`1ts!xX8%p_<)G05D*X$IC!|Qpy=SZ0000000000
z0000000000001i1wr2nU0q03XK~#90?UFHX+b|G?rG;}S(yBc+3A!ssa(D04-C*Up
zh9uTq4J1FoP{*P`VE)^loVJK9+C#@85746f`0m}2S@xzk{eP2kDQ~XUiw9a>CZsIx
zZ;6%{kCP&}C%V`ruO4o1!PHc5(umLu5Logq9Ym;)oWRu9hIEh|iHN_IE4{%lDL_i8
zIHX-0gii@zIcplJsh&B*PE(6~#tyR;)!=}$B!I8%U-laP2;j7b*zx~e(7=GX0D##&
zt-$x*knz(VJ%1ZNjzCv?OabqB50BdwtR>Y*2_QEFPlIwBLT$*pDex2GVINve=xVg<
z36On@hp-(~3+ODoIOI34fpQ4*VJLY52mT1;`gIaf2bjl03snCGq{366@r(GZk+7|l
zbyCvlEW&_Y#6pvSjw<VjKI2JJK`0lI&+(HY?D=l}*?%Y<szv;9r(DM?>t_J=Y+D-{
z7?8(0a!xp3mT)+a@wsJypVSDP8e~~$)-lFC9<Q5$$+oq3-+9|)h*!~gI5)^T58Gkb
z8wM<A2<P>ztL>TrHs^dWt!IL5!!Yy=G$B#vlnNk(V4G&zf0Wc%mE%HSI>4y>eFbhj
zDcUM&kT(~1<*^_j-60F%<-b%i+2XI1gz_p-6d%$p{z!!D_5W1A0D~utTXj$wvj6}9
M07*qoM6N<$f_PvLt^fc4

diff --git a/graphics/frontspr/gFrontSprite766Greninja.png b/graphics/frontspr/gFrontSprite766Greninja.png
index 16b2feb068940d6a7ce0bc2c60758aeb50d5a6c4..bc74f556af501eac7031e28521a463aad2b2f6f2 100644
GIT binary patch
delta 743
zcmV<D0vP>`2Z#ocEq@?T5D*YCQq@X9Ir#9nxKMC=FggEtkhH9WVz~b(ID`23_>`2C
zz))cS000{e`yT)R0+UHZK~#90<&-~f(?A%;&lXZQ)XTx-Sc)%0Be|`(d&@v?L+uxc
z<biL|EtxW8sRx8qwn!|Mn7Y|Fp(_J)#2~e6;-w3n@)@|Z-G9XP8JH2CoIF22@AKZD
z7oq>@aRz?@NDVl7-C+P*;3OKCFHhHJUBF2cmG85M`25TUv|bwQ#QHhkL?{4?(37Y#
z*qIt2KC1%`N9Z()-WUIrdJ`bLW)L?37g(@sT0MG9P#Vnl&;~fZ^Z?_JTZ4C$(rxcU
zc6@coudYrjV1F9VX=9-bKnh@784Maaa@jG4G|+$%Ce!#HwE@h4z_VzqV^1C|9iadS
z12~Efe@-Ur^?G0dLk1-<)AE{H`c6LqB9iBC4rjVMTSwFW7w}e+M|&Oa6(IT<{2riw
zBE$;z$6fi5ISv66AbM~29{vQtkNK=)1qy(T0tqia9Dl~$fP-I+<`N=m_7L@KfUr-a
z`H)j{0=Sb}IwnM<F&%0B-H>}0;AD3acyWa8DR5=A;eQtbc+V_x01(<0JP?o$*{-`-
zTxbB}U274vfdr<31p#fsymm-TGyqAsSa>ObP|)`1(+~huZ*j4@1GvtXtQ|978X)QU
z*;f!*mVdP^{G~L2O8XTcTYzVDp#eYp7P36EYM4H>uBfgRDnHL}lU4`{SnDY|$d^GU
zfT+T%H$Y)7sY?6~08wi8z)@VY3HGoBps)bUn4m?qW=M=_vH^^nYF-TjD!(-!nITjZ
z43j|}7y>_7)&b-;i@0>)%4$k&BDL<H3mR}>Ghi;mK5pGn^NUFJqDm$9vs>BTGc0bd
z%hKA4Qwp^KZe$Fro9mmxR~O`^X>Bb)(3Sj5WwjKIj~`R&cHNe5Go=Pl*Lc~w*v9|J
Z^9z46{c`ZUxl;fD002ovPDHLkV1g56PrCpB

delta 877
zcmV-z1CsoR28{=hEq^Fb5D*YJV5n$lQ26k;xKMC_Fi7xtkg%wLSh(;gIDq*0_~_`+
zz))ZS002Z&FR}mt0~kp}K~#90jg+xZ+dvq_FDWW3&UG`9lCwl8RtNi|Lwj3=|9~QS
z%9bH8LWhL44Ahlah{O<eLh6*wwmP6IONTDG43shCf9ZGUIDhfQDfE=Vy7$X_?|gSA
z<o`yc@eDvs;KMV(!C@%@ioiiw3N(O&@M&Np3`+@wYCtb#BUl)`?DkDSHw_jBz2hkA
zF90^r!2;nx&-EiUPBOrO+8jWGEMZgY(U%;cTZH<AyjUch89){2jg|VA^*)#<%nb^_
zXasws(f2%IZhsIpmcY#%I4l~le4P%xp`7h0AUEhR9ApVl>Vdx(EDSp4>vk*;JODok
zTPND!+|)^x0^kpVaOda*-_ga2jxFcFVXxOmy|bc|Q!T@Oh(NE~?W`J*(=h@feiaV7
zy`wey=4VOyolMaIWmeKNKu%!)S^*`QkWbAiI*egE*njD*1*lJH%J03)pw(RmR6qd`
z*DeRW=n264{k3%*b;}ir#dptbfRN!SyeO}cSl+wc$mMU99$m1KUIFiRH*!GhQO74W
zQ?{&>@>X=t^a<%WzLgljwj3uZ`0PyEJGkY-EK!#al;e42{XSzu+!1#Lu+=^%4p`*%
zaHxUUvVXRWir|1h1+Wxw1<*vuGZx938sJq8`089h(SlSYd-H&kwOa&)0z~SWfSjc`
z9b-m)lAxCy8y1z>Y^rR9J-m99e*k_;nHm}OsWRXq7KxO<GQg~<bOeN`NjY|)E+<n1
z&<7e&kDHHj>Oy@sxsQ#O0I4=$O|0XJcs9E?_kV+dXDgi`kT%x<gt@VeI&to%z=WvJ
zY;();>aj%K2DNPjGc2(R5S-51G)UD|eH*J5ZjuA)8CP5&7;E6aGQiIQ87qX~-^A_k
zTSGrCj;t#dkN9oy*-&J_!ni7y1V#{7o6`aihqdAja1?-Hem-H>!jCp%Tgw-rUjxqp
z3ucn*@G3PAUj+nD8+mcSr4$_1B;{@1_VePZ4l90aP`_^TFlF=Nt9P_w@gHHz!!|67
z83S(*yH5FlrADr~PQ00oD*OXb>r{YQtOS+69?y=y>jghQ9{EbT00000NkvXXu0mjf
DPvD!u

diff --git a/graphics/frontspr/gFrontSprite821Avalugg.png b/graphics/frontspr/gFrontSprite821Avalugg.png
index c7d8bd6627455c38d5ee75af222adb6c2a2198e6..ca013e608f4e6840f8939dde47c4a691bbafc83f 100644
GIT binary patch
delta 837
zcmV-L1G@am2H^&fDSw&Lq)c6ej;YK5006(}|ML3(5D*ZAVzQEU$>6F}|KYWDc8>r5
z|I^9S|HS|g4-W-S`Zxdp0_;gdK~#90?Ub=@+b|G@B^dA=(u$3u6HkgAAWKRbDcVk?
zX{4(Q5nWvcP=<Di4VYaUpn%?_57A`pluQM(<z0G5$x58Y-hT`9U?Y+4<9|PoM@P~B
z*by;1-kna&4uG-5T9a<gvW2Ap^?Y`ko5QMF0LEsKnC(T(TIXoB8F}wF04l3lReg7P
z(6<J__a5>cdPlkU)un9$Yp4x?#HY?4R@rkzg1H>O2pR7yj7xazlhG?ck-V{(S+d#s
zjHy75s}Af#;D37W_tt=;#qJ}i!y^LHS|Y*Xu66*m1E`72h&k;+U<Y$j2@ZT6UvW1^
z$pDZTGV3OVK$A*I00JV3X&#uQ1$xQ@wsROfNa5U!G1L)i9O_sF)`R5@&=F`bp9Yy!
zjVW&%U|s{G1scSUMwx7)?8I7bLx~1pBoI78flX5~vww+MWV)#kMf<gY5hn!!IUsNf
z8MFXD2m-y=d<fP|9nVZQLZB=gVBo<y&8;|E13JU0E7u-kcj^}`JH3EwMbqE_%ZEIx
zPm4VIM8Em*@*eFOn**KH@SHK<4+7e0ChUv1->&X|V+s2~DFo)-foH+xpodKqY*ZcH
z+}`10%YSmMa06Xnz~{lD1oaBnToGVEm|TngJc>aEAfEXZN+?iYZhn5k&2xhd!vyCN
zXdYt6d_f}&pRaF=3`91?P6uEK0!<`tR^opK(swt%@VG>VqscKbAYerUC*TYZM@qQ5
zLnUq-AchNo6;AAwL#oGSd{SH&0l*RLQ*H3n%755u^m5XfbfWGVK)>K(fFnuU>y?nw
z%nu~UerJMjy3`(t`Bhn;qdKNrN5C)&H=w}xof3z$J!k~<5(o&<rN71gboK-ge$_lt
z=>ktQbf~#^2&BG!BpG4baivG>Qd&lT0sV&;3O4e13!VVcW*&<Yz~<4m7~@S|!e|FD
z$Uf2dsJ|WXxxNVJxFz_~X)kvG-7`1ya=6_C&X_*u&;6FS!B}T!{@;r~n$q*X3pyF_
P00000NkvXXu0mjfDw~K;

delta 814
zcmV+}1JV592FeDIDSw#IpfFf~u;B2Bu)t`LxOh;YaJbm$@c5vBxDXH!U}$K#xVZSh
z0QlgD`1trxU}%(#1t$Oi0@X=GK~#90?Ucc48!-@uebs5-VMK6!66|1-%|#Dk1l?2K
zVN21`ha9@M8jBnh+UDLs?jg_7hbVy%R+zA*pw38Z$4-;I7k@g~B;NTn^J`{yCX@d*
zVntkyyE{1o#MlAI>P>H402}((z0*dXwCw`P4wDq|aS{Qn<<oL*j5z=}t%_~?$u=oI
zNJP^=`vpH^-@Eo42BRGQ0N~(L3ny*)8qtxjp)Wzwn3n7u_jN{ogcPJ1B$mK3cRCAB
z(9o%4cs4q3%zxt+uzc8l<mk9ZV3k93l-y<om=$0qN~xI;nkv|El%&99dr!BK-X(y8
z5wk5)G7{;%8}8xA9TL;+fZiLVa^{{oZS68filhBH<pGai5W)ZmO#+)~3RC$t`(Xg`
zEyR350_meDOgZx~0|<~(3_#=nNh3Ncns+61a#1SWj(^ot4j{F63^Yi<5tg_E!f^`F
zUxW%lPHiY<IVZqx+qp4ltqPz|w}2{X>ikwiVUNrrmPcoJ?Rgq3Qu^eNxm&E!bn45G
zUw0%=LWA6?>LSKGc7?JkYWV&2^Ud8YrGO9K^RS4GiAm+Ary}Y&Z%-fY2|$RA@^k@#
z5yL7;bbsit=*$fR618lU?pKonT>^@wsUu7B-yXhS(dC1rf{`Nxhdd93jTC~3%j<hr
zqAsUY=>*iMNknItp8k_qT|WGzcIlEvGmvA$K+OZE(NlAr!<$=*6kq@fJVUH$VyD!0
zwU%q|u3Z9X1bfbnhD%w1A}wCb#6-~bdl&SEMt_p8*Yjlw*f?~(nC0nQ2}l0g=RW!s
zzjX{$lRTaDTzDEzd|oh}s*!;_I{eo?O_whKZR+6{$DxKns?hM>5m1@^Z6Y-6#+83k
zm8ye<m4Ute;$JMZzktb$g;yvBMpo^b-sBqRBfzF1;q(4&z%=SC_3;f0wN=KA0K(g)
saVOQtx-YD{2(Rt(oy90d{r{f*0rzHy4QGIm#sB~S07*qoM6N<$f)XN+@c;k-

diff --git a/graphics/frontspr/gFrontSprite822Noibat.png b/graphics/frontspr/gFrontSprite822Noibat.png
index 3b489c5f43da43c1cec54c5157a765330353f1b6..4e5ffd52a00c8deaf056ec8bce3afd81847cd2aa 100644
GIT binary patch
delta 638
zcmV-^0)hRj1)K$tDSw&Lq*6Ir5D*a0q}W6!Q2+n{Z99CQeyEU6oJvwbF)=AKCo_wB
z0RPwk{{H?C4-W}oZkqrA0w+mCK~#90?UFx_+AtW#9g7bDhjfuTnfIg%VWS?hP^nT8
zL|v;>XRgQ~rY1r7)U6PKXSOh%qEjXOF*@JMc;BEOqIQk~1%EqVpnZlY_Ve@ezW#&I
zKdZ`n<8=4%7n*^?bVXQzbe|O300D(B(lIduOcNEc?3;m#7>xx%;j+&k=0;%2r{j4=
z^f{l|06rDXRQXe8suA}2h=<_^%9#~lqv?{;S<eR0$<r{U!Q@Bp-q^#6PNV{6AD@^R
zNRx@|v1Fz`rhf{mMt3HMT?Lo}5W=k2O(+f6&>Vme45=2_e1z%+(6;(c;nSd63OrL<
zv(>04H0iv2qLkp)B?B1UEP_?%*Di<=Uav0ze@nc@gLnr!-ax38*Uo_}Nt!~4&d(jE
zRRlNmZ^Efjs48G3Uq16#wZm%3DdE(E>n~rMOR<o5oPQJKw1pU)W+<Nx+IYk$=Mlun
zW2)NVcp#4Q8FQ~V=Wdig0*=^N6NfXcYo84wFXA$95$s(TfT-^yoHi@u#<2@6nR^j?
z1-`fc1i)<(QG;A=v#g;5#YqGJ!Ub{fD?8g1xDY8o<LzM|So;L~*;-}<g91`@9T<)~
zy;Z(CaCg5ELou44Ul(S@iZ|TP$bNJty%41PP4z%tM+W&@shZ3#S08~)Z^I7YY_rWa
zxz*PX1*EhGAmml`v6aY)5RS_LtX_*-Rsu)rwUkBRSOKLG9w5&vtwB^u8K70V&;PRN
YH^;cTq;l`b_5c6?07*qoM6N<$g1<K@ApigX

delta 654
zcmV;90&)GE1*-*+DSvRlpfCtHkVu#S003AZScqtlNKin?px972ScrH4`1ttv*Z?Rn
zAQ%`B00000005JpTj2lz0yarRK~#90?UONY+CUV?58dL$Qf)OKfHM;7iNiQm$O0Cb
zk-4&zp|NyQrDlkn=;#)ys?1ktz6N7POPOx48ud25OW)x_z<)VlulgqJ|Ih#bd-o26
z{>^H5Cv?AgRQG)H?x;N>$AE?pdJ}n`2dJ$Tp9EdfG%k>2X{AAea7^L>S(hcrCm|oV
z1|(ptV*@Y=c<i^phV!v40h6=I2-*yJJiR6KEzk|lCZCD15pBO^1BQGAKsXTq1ePHU
z0E6<8xR(CV0)OC`K?PtyZevRVLToDKJtSPW?EnTH2tH`b_qGI-%XM)nz1Rjg@@fs-
zdtPi!aPHc%{Pt63acng}`CTiJk55t7jfd75@&UQZ9xtK{GpmmBVJrHuyolt3RfZlS
zmVH?+rJNrEU;_3O$%GvO=7x~c-hcrX88hdQ9Rd)hJ%7eF2@CjQ+wEeD^hDIBRUVAB
z1<Wt=;OdkWeRB#JhIL-&&F2s13v?;OSEUp~ID}#I9l$&>#JCnhse-ex+UpKrmdN<*
zMhjIGAzxpNoda{Ki^4B|X`L1<_-jxDBu@xgeGFMAz_o-;2JNsS3HvOdQ5|rq6U5LU
z@2eig`+o_Q#jJF-QemQ$U^Gf<TX*uAE?qc<;*)w7g5q9UTe_oli8K&>&{O2zXu1!;
zD{!bP1)zKbpcQggM%C%L+2>1LuUvFWU)Xn>Rsp5^o1*i>0Mw7<1mK(mrW79sB*pYN
oaOiKdseEw)c)jcYYp?zQ2UOBz4kOeA00000Ne4wvM6N<$f(&IRI{*Lx

diff --git a/graphics/frontspr/gFrontSprite837Zygarde10.png b/graphics/frontspr/gFrontSprite837Zygarde10.png
index 4d87a448923ecfae704a19c737cd0fca8f77e556..20648a377cabe37fde27a519f0ec3801b48f6fc6 100644
GIT binary patch
delta 642
zcmV-|0)7331)v3xDSw&Lq!17gDPjnN%{f|}7$6uJKQS>{N>cv*{=NTu%`q|dQaKC^
z3=Itp4h{|v4-fiY<J15E0xL;GK~#90)s(+(+b|HuB>~*Yz);sfQipc4=)zqU6V2)X
zCe@XLud|v;Y~~Jio*>=x7Ja%NMInE5RFEY@Inb8ApYFcnk$+5*|7++yPHddxx<iSz
zjxXqJIO5#8WuVs{7{r2}eZ6xU)7bD-5a9i-b52hQva%)tKK)jghy<XN6lkwMoSX{|
z3R#~Mi|+g9Uz46ibYI@}cDM@BB-PQ~ZtGkZo=O5_<{+iKd;lUfpe{GQgktnS09neS
zQUg!2-8n7-^?y)Y6iR&oo>i(YBOa4<rNkM)S*6rY(q;C9NC5!#W_1zM{m22+G(6=?
zz)HzYv#8=I?_*2+WPJQvS5pAJ07%sby^8{ed)yKG#CO)l0c?ir_qg#PYLz+VcT}&j
z^E&2(xyLc+h>xcL64VDqb~ld%^>M)0f9@UtF}K06hJTyWt?L8Op{nh3VC#OKaObxH
z(4c_;K7t24W3c;to?`US1poxhj`0CP72UfLu*v+G8=D7*U1wbEmS6xv_)mpk-~2ML
z{X7JK#o!&9&+#ua^B@K^$Mv=d_zj$swPdLHhU6#+BuFzD965GmKtOnc+BEo4iynAt
z{UL}0?0ZK8Hb)?(DH4V$*lumc=uyBIFV`$cc^pW}*8qG0F#gpm0J8*y+~qo05Tptg
zzMOy*%pAy%BTy;fe^N^#<YNT9WJU+6wVVLB$Ff>ZcZ8Vhc#Zj~tT#k?MwNB*l8%vS
c=(ivL0L2}|VmLhGCjbBd07*qoM6N<$g4q`<_y7O^

delta 615
zcmV-t0+{`v1%(BWDSrT<=l}o!NI*C!C@4@sNci~ppvYKYcsMXfAjmK<@K89I(4Zg~
z7*Jp+00000006!#OrQV&0uV_=K~#90&6T~9n=lZ^*-_(?6%(jgW-jeXdW1Ye<{khS
zvRhJ^lu2{e6WlvonK#TzGByZ=%S7XmN8TU%-!I{!_>UGov42BX?gLW!U6`C*$TIAd
zQxZWz6Xk?-P|(!oB(yQFg`qa*Kzw_n&QRWgV0FK;#Slk2(vAZLUX&!0i+};5FW>iS
z$@#sR9l+2F8Jz&|I12h|EzuIdW_SR-wf01$=Js)%c{nlP<^bS0%xiLW){PT@SU@ul
z3%$eWhAIHgxqorQX2c{T#1g5konx(`VPqrK25ajVmVlcrX)eKxt0LS1YtL?a6y&OJ
zaQ(28G?sGRSh#+keusGgq>e``jRTs`o~w<Bk_SVVkoF#08!U0My0S9mG8rJG*-{3<
z%zIPlmM883bP6i95Ye@yT0Q_{mi9v1AH<(%WoIVshJU^s>Cy*dkg5`Ul<57Vd^_~U
z4GBS_2RL}SafyW&mn^`Y=bUL(NfBzKSlk4lO??P&^cv{%m+6fAAUf|{l2+b@S+_IZ
z8-BF%6-KiL$d`@>0YeMqDh~*k+lOb$44}f^VE|wQ2*1eoPZkJa$vy&wOaU2hUVR5t
z3dC1nZD1>PJ8vpH2f)TjfFw_$Z$W{LZIoIs06ldNZ2XpTk%n(}JRk1BVjvi}y~p1#
zzoMsPXb~p|r*pBl4(Ff!E>OImpZxu8zkdGl`U^fOXwH6Ht1JKj002ovPDHLkV1lGs
B71IC!

diff --git a/graphics/frontspr/gFrontSprite838ZygardeComplete.png b/graphics/frontspr/gFrontSprite838ZygardeComplete.png
index bb790eda6722cdb18ae0bedf969783411d9fec46..cdbbc6fb75bcfa68e05c24c24ef585179ec9c58e 100644
GIT binary patch
delta 1189
zcmV;W1X}yz3BC!CDSw&Lq#hU*5D*aHMM{$v9Eo~zKQS>{N>Wl=9fQp|TAUbLlI8yX
z{=KxcI7*rKk|+7RL(%{M1W8FmK~#90h1I=p+eQ=sa8iH)kD}o6jI=1oLv&|5=@8RE
z=2ihbJ4-!i=pF3405JkkVeYx;M^F!zDbzzWiQ3#r?${}-3x7BWf@r7#0Uq43>0qEs
z`UmtKN!hX#Gz0{g=b!E#AK!a&oY~8*eq@ovj^j;(V$sd5hN>G+Z=g-+LX`y8Y7qW3
zAlh&OF-PEn0imY=E*f5oTRaT#Z&0xo(;I;19uGNg;TkZpiDv+`;^mNk5e6Rut|1n%
z7QagZHwG<c0Dp(L*4oi5gn(E8(||#Iba!Wm5fczG3y8v%Z&%*D@st-3PaC7Bfz<J?
zcXX@(gb~_k0@W#?L`;Y}7#zeg0&^3%Mk!x-#w=$2HWA(j0lS6SOOJa%e7l310isXz
z;^3g2+(Ur5zVR4DDRt|BU}Vpsfid`)${9euBl<IV|9|g&Vmu4<6cB%35;c5(|0!^z
ze9$+Z(}o~_G_Q8_a{yqm1!e|l*m<Rt1|u;gS{r{Ni2Na#Ql95wFoJS?PKd#LGXVsV
zOyGY#C4A||SRMGeIs;!70V%`%ffAlC0~dUZg<qdR6agV+CGEF`q=DmW3s~~y7<~Q+
z>)59jn15Cczkpd-PgoL-&-gTLYw%fZckqJ+*djk|ttG2lW8l8b4)%;6#^=XBBdEFU
z-4|PHu&NvP#-N{eA2BXoXNShr<b1EwUqHaFK{xAmsPCU+3_#_4Kg|}R^#+Z~Gu)R;
z+2Gd@OQ6#RE#-VR4Vs(1r9mjnE|!aqafg-uLVvUt1-FypjJea-OXqup00K<0obR4@
z|7b*$VAwpn;}ZkzHkP{y>cjfUgD6_P4MnQvnx}8iF0oQEeb}RZF!#28vfhYRE4ooF
zz-Y)WZGVFyMv($MjlQbrq=>Rv|NY$)AIFMP9A}4gn!$!nEGS>-!|glo9%=-Xazo=W
zSbq;#`9g`h{Ogo!BR#Ly8h%}K<^uNy;0T5YD1v9hksmk?zVF5)c(RQ^)Uf7w^G}>Y
zRRjrK0W7)gA;W4#Q2Tzki8IDl3<TpSD+o^a6?+__s2`?#u9*SpW>>LG3u?XP9<x=O
zgEA3BrD<2H0%Vh*NF_#@b`U)NEeCr8DSt|^6%}v8RUP_^VoxmaRy4CABo8J)#k4p#
zO#PFefp5*GVJ$zREPaNP53u=iV6f^TiE@yX&EsLa0yb@)38SvTxVtI>i=oAoZ@1ui
z2+=wMbv2Pg3o1-fAq0maMg$_xe--97s@P4?aw^oJ%IA23tuA}tqItoL?AXEudw*d~
zY~(=WeMRP3xESFtgf4;O)K72>7QhMeL|=>m2L#9xd~%|3N*NuDyMOUw)V61qz<qY2
z=nb%ZxQPve)2p~8yJxiHLpa_L0XFMC7&Qjz;dw@B<!S?GB|FYu;2<nlma<-&^{&5<
z&$4`+9ogA5_WdmD2hOCRlm-*NpC0w8^FNpM6Sw~X7&7LzKzs8P00000NkvXXu0mjf
D;^ruQ

delta 1225
zcmV;)1UCD=3E~NmDSy!TxF{eX5D*YJFfdq1P#_o>khnN#h&Z^gu=x1+SeO{_P&iPC
z*f>zA$S^Rt_;`kcf8GE91Z_z~K~#90b(PO+8%Gq!Hv|3yW+fV0XxM!-D=ALmpn2Ms
zw8Ws@S=wAe(CnrmIT#u&gKkz@2YifUi0REuz&cjOG3eT(z<-C_b7<%>J;e6Spj&+I
zn_XG9WoOVqKR)_?-+S}kTgS=I70+=zhdEd1Jvf(~l5&`Gq*o$Jdl!FaC2%CYeDs_^
zM;8H~11te(0$8FGk4@Y7zN)vQx)$7#I!&TrN`%!3SRsH@9AyHMO8{SMzlp9RWs+S2
zK&h;Cvxxvw=zlbpt!bcID*sG?a#d3_2$)h3yt-VzcLHF77XetV-+S3C`2w0QhNvzA
z&-uOAO>i*>jB=*|_j#%G@{aGK<Sv?U3Sf2aR+qolJzuB-K;OFve6_Ly<X{0b7lGC@
zzVaKW90)H3z%NHqswVgXGdv%J1%!@*EHl!Lm9Tl91AheP?vB*SFYO&EQ_KPGO#$te
zP9JuRkV!~@IiH58m*nF#NZ$UAD76uJo@YG-eIFVfW(NP3i3SU(^FaOPzlLIe^5meE
zXk`m=E(ikL_v_go;cyQP$jBDrtOrBn5Z~#UVRnGVlV}Tp{;3235K7EXNKKhiOy+E&
zOo1`V<bS^#&ym>}n0T-inV<+-0ALgiPOLDm#6+UffpW_zLCHbjF->XYiJnNX+1<7z
zhw9S~n!uBBL{XCA1gLGUbSxkS+u8z+S&;)L9&F=!WdPqA&_6T?fUY{;1**hEqPDpK
zyX{-8C|-R=K-B3T_xm=Z`Tc9T1k^UyDxF(0`hTgjq(c=Q_mBG>N)(TVbDwe#s9~l5
z4#nDFdktH0r8Zj~1N)x}j~BDEHx1zH@8UmcV!Grx3pm0b_vYtv0ARHnDhg|`O_f$l
z7VyN;!TcWXUn}x}kD*M%@3(i+Xjvto>WHHe0cunL@844w*wjNxH0t-RZ#wK~I2<0}
zTz>)l^IwpTfizM5jq5KQ=f-d}JZMA(z(43DE`UU*05w`+H}-IJsN*p}El-655U4{D
z4S*Eb9yT=HThVedru!Fn-??Z#y07g2=1|{19IwnErP6x>KX8Gmrnbm+wZ6Z1Sa>{I
zCxHhP1MP=U$Azo~hKISwOmB-WTQR)rTYrhH*l>Z=dUTL`On{H?Xo#~{>sEG#w<t#4
zI0MY!#}725k9u1V^3=Kw9qR~AVh|K1O(f^FUe9{4Z+6L}Q3RPiUK|60mk7v6f?eHp
zHA&>a!eZM*=vg1C*T&YvMf-qQE=h7IfX{D@Ld6uL-GEuv-tidc9EDcJXv`Q|N`I*6
zq2<vSE-ZF-lz(-VD;MU*vm<n(&>K(s?c*#}eDyD(__fg(pv!6mCzGs>(<H7Ax>Q%b
zpZAlks%e}IB7|8&OC)$qfNOiQ)&qOn6TlIvPPH1mRm>j)X+rzr6kutV>bUYNJwZMD
zWzfs)9GwCVY`l>%Og`VvKA#6z(n8y62{qv>R7Trw6F?@tH)(hZFzO(9;G7<@@MwWV
nJ?Bd&Xn$^#=$C<9^3?Kw$%|)>V)wAj00000NkvXXu0mjf&mBXJ

diff --git a/graphics/frontspr/gFrontSprite839Ashgreninja.png b/graphics/frontspr/gFrontSprite839Ashgreninja.png
index 5096be750938713663063b02e8e70a0e1a70a062..6d07fd8a13c91d2f276b6fcf864f0e2105a50416 100644
GIT binary patch
delta 791
zcmV+y1L*wa2I>ZoV1M;VL_t(|oaL20Xxl&($4`jRj*&gMgu0;9;3Xllo{AEebdiP(
z9SX%+JQlQgiKO9$Y%K*_CD{U%AWO+$(9p#+i>J0r2W7A`bcyCd1`p}d%{^KE(1+X3
zr3W^G|4;w-aqmuq{7;Kp{|it`0X+N};8lG^1iHS|4SD*o)_-g^R{^S#7_1$brnw+E
z@sRy@*$<4wV5*zu^LYv}aNnEii9w=g0rwr@jk!UhoAL}$#2&flc48o7uqZeNj{LWW
ze9E8?uxtn~_KsaI=&1{XHpnEkcrgeV5X^uzrsq0U4<7ihHiD!{ti*msy@#Y;a{Z3I
zq3W!zX3HGNS$`mK>galilA(WWHV1=2K7ga{d%owPV?1fK27`WKJJqw3uJ3lcjt;FC
z0FA>uz`G}3{qD^h-7rAL;Co&tWS0Rap<$@5q2C4t1J>cwuJ7F#=exfDblfW%5Mkf*
z+|y?#J7>@s7Yzu9<*s-1`sX>@tHz29V&JHQ+Y?m>SbvcLi(p^wbnHnP^mcz$2ApM?
zJGfoGG@%Xe<>LDlOFVc9bv6TSa7tP}1{V%Bd^{bYKA=Mzy&Ul{qzcMBn;)nnDpC;i
zFazvei6{xe@x|Tb2LnW5BN%509vx;(g^S6AYRF8iN8{TJ0iZE}3d$YT9K@IiKBNgQ
zysk5VGJimk5N(Rq@i<5kd=!;pphTt3YsAfvVg-YAN2|kFr)4UIU(gQ2u(nPRQ$W2m
z1C;Qy76YHeY$y1sE((egjuiVQyc*^J0#syG2%tnGg;t|zDCM^UC@`HUQH`<Hs8r4a
z1cdmcYSf9{1X=_bA;*K`#BP)pLJ%k?fIRK2LVvSE!3iJ?W7h;=Whq&U3QBv^#5reC
zc;@u+AoJgB_Htzo5QSzh5Vq&cokLt)TGf#RLMBV*S+VATK=+~%+PNEEK+#H)<7(&t
zEdA#C*3cTkETEH^rgeKOs#sBtCIJhlgC)p@+5!!K_i15<Y<yRLO_osc*!>&p7qEi}
Vkr372GFJcq002ovPDHLkV1kmma&7<s

delta 786
zcmV+t1MU3k2IU5jV1MvQL_t(|ob8ppPuoBk#?P{<FmiT_r3i`oZb+qq;`j_kp)Er^
zz}6)!9iwK+lGwu`Cbq<tnA*V}D~41avP5*r1`G_&0P4`8o{<=kpnrgSjuY@lM8__D
z2P^UO^K;L=_sRy~e<ch4Md#$iAEG=B5MvG?$O*j`|ESmN?|<h2yfHPXH=E6m4}>7G
z%fcbkwW&d*Gh!A2MSy)6>9N7HW*%5@+kok@!CnkBW(%WY8|*t1AZgH05<tOr`apX$
zXc3ZVh+3rI+)tkMXfPzHKBz@60*<G^UUQgf7GL~oJCFgjc#EyHPTM?u<vLV8HrAPc
z{d;See*U0Oq<?+4OHIw#s@Fe^M%e`l#ISAG?ozFGaxxl?a>vQ<?p)Z8)9Y$v{e<nV
z53;rC__lL&VX!uk!oi@O1NaE=&yCv77vr6mHvrnsPuo2@-#v5P&$l;u1He7E?Vj`F
z;>@m*!F65-QfJfd_R99TVURfqB0%p^GyH83Qk|0kaDUS4Mvs>7h_*4R&NYyh8eQ{l
ztJ&BXR>l1DkP0uFge<WM8R`{Gv%vCLq}F6cTSTWS_A&(LpW>1QNK_KFP}TEjDhL1T
zN-`@@^0v#N&HxC#!F7tzDKkcLaXY-n)RHKLx3~Qy!4tv&B#UK)8OsXZcqxzNF%b|#
zm;s0ZsDDJI!A;WRZE(qSBqOAbb!z&jr4Btvo+%dy6F^08e4VcP{%HpkXkxQGL@|I@
zeH;P4u$XRzIsu@FSI4-t=KDbw;8i3b8H!{rz(@{)Ku|!Iz!fMe{MwbJA{boCSpe`A
zk<B`9mK5d&g**@u>?%<uS`VQ)4l!WGokch;Lw~Wd0+kuSili+#YLajgT$<fiaf%=W
zY*QSOv)eqv=@$q)b1TYd%>X$>q_UVy$#%)nSq4tPVOXMa+Juu#Y1%@8QbP0xzXv^(
zR^o7MDwK(7N=M-xUAZ@3#;pL^VgcDui-dM^(ql@U8PEHgB%mk6e^`G25$6ERca9Qk
Q01E&B07*qoM6N<$f>a528vp<R

diff --git a/graphics/pokeicon/gIconSprite1040DeoxysAttack.png b/graphics/pokeicon/gIconSprite1040DeoxysAttack.png
index a6b01d0ac630c27c1cbb55949ba73f57a57fea30..8deb949eb0ebbc52106e387b669fcb91ac4fd4f7 100644
GIT binary patch
delta 319
zcmV-F0l@y!0+j=hUw;80Nkl<Zc$~$Ov2KGf5J2w_PK=%U8~vRw_J%iD8vFy@v-Eo^
zRU&0$i@IeZ&PkPwBGFt87-KVaYP|XB4g~K3-1#tV?nMF!OA!N9eWBt3o9{$2VY}CM
z3l2g@@4=_~Aj?v(;G_QTYQ0Rj(d(xXD%_7>e0zJpEO)HUNq^*(d0h5~#tN2MR<eJ~
zK$gKi><d{<TiBoiygg^a$h-+a7;`>y(a{JjAq)513-l8p2kKVYlLlKg(}xgnODHwq
z43I{MF9FODcM5tFfIB|~J;%Up=^^>AZg1GA0ET}*_s@YT&B58HIET@`igOt4&pAZ)
z=NuyYa}KfnDL9AKzR!VH`#y(Yf5~CBpXT7FTn>?ap97~kZ0x%&+T`#@`@e-!3^MH4
Rs{{Z5002ovPDHLkV1h+Cmr4Kt

delta 251
zcmV<X00jS)1JVMJUw;7INkl<Zc%1E$F^<A85Jl$(bDcfWxFYV72I32BPs4eTkPPV}
zZDFOO3T7lEM@WIe1QHTXkYax~Pyf%CtpS*ugumu=0vIzI1Jq5b$A*xsXyOR<Z}|=O
zWJW#sWA`e{%m?i3rM9MbMC<k7Ne{ED<i6RS`x&i2Qj+_s&vds{AW_a`@@{E42!y|N
zs`4&{1!}<i!jV@=F#z)Z<Rq=51vxMZ#l2@}>TXK}w$$NhAml~Y%OEAAGJr4eb}bDw
zegMe0($L5NqHc@^#~`M-o&4+boiIcF-^ZNp;{gJ@2!<Nda54Y@002ovPDHLkV1gSZ
Bc^v=%

diff --git a/graphics/pokeicon/gIconSprite991MiniorShield.png b/graphics/pokeicon/gIconSprite991MiniorShield.png
index 77de0f76dcd2c86c6aee064a03005f538d7fa399..d2f61341b61a46fa823fce5d7c16192a89c8b17f 100644
GIT binary patch
delta 234
zcmV<G02Tkt0?Y!CYJUy_Aq<9jgQiPIO?20&58$&9lYhi#K1~?w-NFds4M(}v$;58`
zQYfXLbH5*Dou5aWQVIK)1&N_|TQULQyEy@PFK8tc;epU@$q@qRX>6btKrRMIP=vz*
zQWVvQb_e+xw7wKsIbz$uMgqf|r%qbivH?`G@Ua`8%B~x?Mq?S>KbBbgLcK4Ja_@_q
zxc7ym_r;~z7xT+$_T{;(lJw(?zg;b;%YVEY@Ik9E;|drH6Nh1ALH06;^&@{IGy+v$
khT7HuDrLY*nDT`%Z>g?%qH>KW?*IS*07*qoM6N<$g5o}Hd;kCd

delta 234
zcmV<G02Tkt0?Y!CYJX}&F$_iZ2f`UVI)9K*vNzvi0(W%2*(rE*n+D$aRD}{-_8!O(
zZ8}_ZjX6XwKKwK7xBaloa{06ojy@H!zyr~n$O3qWa|f#eptcBCL?C@_4Y(gU9Xp7q
z1()vzQcSfX^_s=q0XkS?$N{l~Yex2HC3+-eZ83mEa@>p`AY;F~5fBT#r_JmOO}>zf
zz7V@G_(Ipo7ykD}2B5xtw9H!67x;q(Np08};HwJLe0hLwp?X{00E$Zv#t$yqY6ap@
kl{oWMk=0Ma@N<Rv19SO!I-ZNOmH+?%07*qoM6N<$f&x`(@&Et;


From a2a9474ba67b229fcf5dab512604eacf9b370bd8 Mon Sep 17 00:00:00 2001
From: Skeli <sesyl.schweitzer@gmail.com>
Date: Mon, 26 Apr 2021 13:45:34 -0400
Subject: [PATCH 2/9] Add Crown Tundra Base

+Fix some tms/tutors
---
 include/moves.h                               | 321 +++++++++---------
 include/species.h                             | 159 ++++-----
 src/Back_Pic_Coords_Table.c                   |  33 +-
 src/Enemy_Elevation_Table.c                   |  11 +-
 src/Front_Pic_Coords_Table.c                  |  31 +-
 src/Icon_Palette_Table.c                      |   5 +-
 src/Item_Animation_Table.c                    |   5 +-
 src/Species_To_Pokdex_Table.c                 |   2 +-
 src/tm_compatibility/102 - Dazzling Gleam.txt |   1 +
 src/tm_compatibility/111 - Smack Down.txt     |   7 +-
 src/tm_compatibility/118 - Aurora Veil.txt    |   6 +
 src/tm_compatibility/128 - Rock Climb.txt     |  11 +-
 src/tm_compatibility/22 - Solarbeam.txt       |  34 +-
 src/tm_compatibility/43 - Secret Power.txt    |   1 -
 src/tm_compatibility/70 - Flash.txt           |  26 ++
 src/tutor_compatibility/93 - Body Press.txt   |   1 +
 strings/Pokemon_Name_Table.string             |  21 +-
 17 files changed, 396 insertions(+), 279 deletions(-)

diff --git a/include/moves.h b/include/moves.h
index 336405f..0c7ef04 100644
--- a/include/moves.h
+++ b/include/moves.h
@@ -742,172 +742,175 @@
 #define MOVE_FREEZINGGLARE 0x2DF
 #define MOVE_THUNDEROUSKICK 0x2E0
 #define MOVE_FIERYWRATH 0x2E1
-#define MOVE_THUNDERCAGE 0x2E2
-#define MOVE_DRAGONENERGY 0x2E3
+#define MOVE_EERIESPELL 0x2E2
+#define MOVE_THUNDERCAGE 0x2E3
+#define MOVE_DRAGONENERGY 0x2E4
+#define MOVE_ASTRALBARRAGE 0x2E5
+#define MOVE_GLACIALLANCE 0x2E6
 
 //Z-Moves
-#define MOVE_BREAKNECK_BLITZ_P 0x2E4
-#define MOVE_BREAKNECK_BLITZ_S 0x2E5
-#define MOVE_ALL_OUT_PUMMELING_P 0x2E6
-#define MOVE_ALL_OUT_PUMMELING_S 0x2E7
-#define MOVE_SUPERSONIC_SKYSTRIKE_P 0x2E8
-#define MOVE_SUPERSONIC_SKYSTRIKE_S 0x2E9
-#define MOVE_ACID_DOWNPOUR_P 0x2EA
-#define MOVE_ACID_DOWNPOUR_S 0x2EB
-#define MOVE_TECTONIC_RAGE_P 0x2EC
-#define MOVE_TECTONIC_RAGE_S 0x2ED
-#define MOVE_CONTINENTAL_CRUSH_P 0x2EE
-#define MOVE_CONTINENTAL_CRUSH_S 0x2EF
-#define MOVE_SAVAGE_SPIN_OUT_P 0x2F0
-#define MOVE_SAVAGE_SPIN_OUT_S 0x2F1
-#define MOVE_NEVER_ENDING_NIGHTMARE_P 0x2F2
-#define MOVE_NEVER_ENDING_NIGHTMARE_S 0x2F3
-#define MOVE_CORKSCREW_CRASH_P 0x2F4
-#define MOVE_CORKSCREW_CRASH_S 0x2F5
-#define MOVE_INFERNO_OVERDRIVE_P 0x2F6
-#define MOVE_INFERNO_OVERDRIVE_S 0x2F7
-#define MOVE_HYDRO_VORTEX_P 0x2F8
-#define MOVE_HYDRO_VORTEX_S 0x2F9
-#define MOVE_BLOOM_DOOM_P 0x2FA
-#define MOVE_BLOOM_DOOM_S 0x2FB
-#define MOVE_GIGAVOLT_HAVOC_P 0x2FC
-#define MOVE_GIGAVOLT_HAVOC_S 0x2FD
-#define MOVE_SHATTERED_PSYCHE_P 0x2FE
-#define MOVE_SHATTERED_PSYCHE_S 0x2FF
-#define MOVE_SUBZERO_SLAMMER_P 0x300
-#define MOVE_SUBZERO_SLAMMER_S 0x301
-#define MOVE_DEVASTATING_DRAKE_P 0x302
-#define MOVE_DEVASTATING_DRAKE_S 0x303
-#define MOVE_BLACK_HOLE_ECLIPSE_P 0x304
-#define MOVE_BLACK_HOLE_ECLIPSE_S 0x305
-#define MOVE_TWINKLE_TACKLE_P 0x306
-#define MOVE_TWINKLE_TACKLE_S 0x307
+#define MOVE_BREAKNECK_BLITZ_P 0x2E7
+#define MOVE_BREAKNECK_BLITZ_S 0x2E8
+#define MOVE_ALL_OUT_PUMMELING_P 0x2E9
+#define MOVE_ALL_OUT_PUMMELING_S 0x2EA
+#define MOVE_SUPERSONIC_SKYSTRIKE_P 0x2EB
+#define MOVE_SUPERSONIC_SKYSTRIKE_S 0x2EC
+#define MOVE_ACID_DOWNPOUR_P 0x2ED
+#define MOVE_ACID_DOWNPOUR_S 0x2EE
+#define MOVE_TECTONIC_RAGE_P 0x2EF
+#define MOVE_TECTONIC_RAGE_S 0x2F0
+#define MOVE_CONTINENTAL_CRUSH_P 0x2F1
+#define MOVE_CONTINENTAL_CRUSH_S 0x2F2
+#define MOVE_SAVAGE_SPIN_OUT_P 0x2F3
+#define MOVE_SAVAGE_SPIN_OUT_S 0x2F4
+#define MOVE_NEVER_ENDING_NIGHTMARE_P 0x2F5
+#define MOVE_NEVER_ENDING_NIGHTMARE_S 0x2F6
+#define MOVE_CORKSCREW_CRASH_P 0x2F7
+#define MOVE_CORKSCREW_CRASH_S 0x2F8
+#define MOVE_INFERNO_OVERDRIVE_P 0x2F9
+#define MOVE_INFERNO_OVERDRIVE_S 0x2FA
+#define MOVE_HYDRO_VORTEX_P 0x2FB
+#define MOVE_HYDRO_VORTEX_S 0x2FC
+#define MOVE_BLOOM_DOOM_P 0x2FD
+#define MOVE_BLOOM_DOOM_S 0x2FE
+#define MOVE_GIGAVOLT_HAVOC_P 0x2FF
+#define MOVE_GIGAVOLT_HAVOC_S 0x300
+#define MOVE_SHATTERED_PSYCHE_P 0x301
+#define MOVE_SHATTERED_PSYCHE_S 0x302
+#define MOVE_SUBZERO_SLAMMER_P 0x303
+#define MOVE_SUBZERO_SLAMMER_S 0x304
+#define MOVE_DEVASTATING_DRAKE_P 0x305
+#define MOVE_DEVASTATING_DRAKE_S 0x306
+#define MOVE_BLACK_HOLE_ECLIPSE_P 0x307
+#define MOVE_BLACK_HOLE_ECLIPSE_S 0x308
+#define MOVE_TWINKLE_TACKLE_P 0x309
+#define MOVE_TWINKLE_TACKLE_S 0x30A
 
-#define MOVE_CATASTROPIKA 0x308
-#define MOVE_10000000_VOLT_THUNDERBOLT 0x309
-#define MOVE_STOKED_SPARKSURFER 0x30A		//Paralyze Target
-#define MOVE_EXTREME_EVOBOOST 0x30B				//Double Ancient Power
-#define MOVE_PULVERIZING_PANCAKE 0x30C
-#define MOVE_GENESIS_SUPERNOVA 0x30D			//Sets up Psychic Terrain
-#define MOVE_SINISTER_ARROW_RAID 0x30E
-#define MOVE_MALICIOUS_MOONSAULT 0x30F
-#define MOVE_OCEANIC_OPERETTA 0x310
-#define MOVE_SPLINTERED_STORMSHARDS 0x311		//Removes Terrain
-#define MOVE_LETS_SNUGGLE_FOREVER 0x312
-#define MOVE_CLANGOROUS_SOULBLAZE 0x313			//Ancient Power
-#define MOVE_GUARDIAN_OF_ALOLA 0x314
-#define MOVE_SEARING_SUNRAZE_SMASH 0x315
-#define MOVE_MENACING_MOONRAZE_MAELSTROM 0x316
-#define MOVE_LIGHT_THAT_BURNS_THE_SKY 0x317
-#define MOVE_SOUL_STEALING_7_STAR_STRIKE 0x318
+#define MOVE_CATASTROPIKA 0x30B
+#define MOVE_10000000_VOLT_THUNDERBOLT 0x30C
+#define MOVE_STOKED_SPARKSURFER 0x30D			//Paralyze Target
+#define MOVE_EXTREME_EVOBOOST 0x30E				//Double Ancient Power
+#define MOVE_PULVERIZING_PANCAKE 0x30F
+#define MOVE_GENESIS_SUPERNOVA 0x310			//Sets up Psychic Terrain
+#define MOVE_SINISTER_ARROW_RAID 0x311
+#define MOVE_MALICIOUS_MOONSAULT 0x312
+#define MOVE_OCEANIC_OPERETTA 0x313
+#define MOVE_SPLINTERED_STORMSHARDS 0x314		//Removes Terrain
+#define MOVE_LETS_SNUGGLE_FOREVER 0x315
+#define MOVE_CLANGOROUS_SOULBLAZE 0x316			//Ancient Power
+#define MOVE_GUARDIAN_OF_ALOLA 0x317
+#define MOVE_SEARING_SUNRAZE_SMASH 0x318
+#define MOVE_MENACING_MOONRAZE_MAELSTROM 0x319
+#define MOVE_LIGHT_THAT_BURNS_THE_SKY 0x31A
+#define MOVE_SOUL_STEALING_7_STAR_STRIKE 0x31B
 
 #define FIRST_Z_MOVE        MOVE_BREAKNECK_BLITZ_P
 #define LAST_Z_MOVE         MOVE_SOUL_STEALING_7_STAR_STRIKE
 
 //Max Moves
-#define MOVE_MAX_GUARD 0x319
-#define MOVE_MAX_STRIKE_P 0x31A
-#define MOVE_MAX_STRIKE_S 0x31B
-#define MOVE_MAX_KNUCKLE_P 0x31C
-#define MOVE_MAX_KNUCKLE_S 0x31D
-#define MOVE_MAX_AIRSTREAM_P 0x31E
-#define MOVE_MAX_AIRSTREAM_S 0x31F
-#define MOVE_MAX_OOZE_P 0x320
-#define MOVE_MAX_OOZE_S 0x321
-#define MOVE_MAX_QUAKE_P 0x322
-#define MOVE_MAX_QUAKE_S 0x323
-#define MOVE_MAX_ROCKFALL_P 0x324
-#define MOVE_MAX_ROCKFALL_S 0x325
-#define MOVE_MAX_FLUTTERBY_P 0x326
-#define MOVE_MAX_FLUTTERBY_S 0x327
-#define MOVE_MAX_PHANTASM_P 0x328
-#define MOVE_MAX_PHANTASM_S 0x329
-#define MOVE_MAX_STEELSPIKE_P 0x32A
-#define MOVE_MAX_STEELSPIKE_S 0x32B
-#define MOVE_MAX_FLARE_P 0x32C
-#define MOVE_MAX_FLARE_S 0x32D
-#define MOVE_MAX_GEYSER_P 0x32E
-#define MOVE_MAX_GEYSER_S 0x32F
-#define MOVE_MAX_OVERGROWTH_P 0x330
-#define MOVE_MAX_OVERGROWTH_S 0x331
-#define MOVE_MAX_LIGHTNING_P 0x332
-#define MOVE_MAX_LIGHTNING_S 0x333
-#define MOVE_MAX_MINDSTORM_P 0x334
-#define MOVE_MAX_MINDSTORM_S 0x335
-#define MOVE_MAX_HAILSTORM_P 0x336
-#define MOVE_MAX_HAILSTORM_S 0x337
-#define MOVE_MAX_WYRMWIND_P 0x338
-#define MOVE_MAX_WYRMWIND_S 0x339
-#define MOVE_MAX_DARKNESS_P 0x33A
-#define MOVE_MAX_DARKNESS_S 0x33B
-#define MOVE_MAX_STARFALL_P 0x33C
-#define MOVE_MAX_STARFALL_S 0x33D
-#define MOVE_G_MAX_VINE_LASH_P 0x33E
-#define MOVE_G_MAX_VINE_LASH_S 0x33F
-#define MOVE_G_MAX_WILDFIRE_P 0x340
-#define MOVE_G_MAX_WILDFIRE_S 0x341
-#define MOVE_G_MAX_CANNONADE_P 0x342
-#define MOVE_G_MAX_CANNONADE_S 0x343
-#define MOVE_G_MAX_BEFUDDLE_P 0x344
-#define MOVE_G_MAX_BEFUDDLE_S 0x345
-#define MOVE_G_MAX_VOLT_CRASH_P 0x346
-#define MOVE_G_MAX_VOLT_CRASH_S 0x347
-#define MOVE_G_MAX_GOLD_RUSH_P 0x348
-#define MOVE_G_MAX_GOLD_RUSH_S 0x349
-#define MOVE_G_MAX_CHI_STRIKE_P 0x34A
-#define MOVE_G_MAX_CHI_STRIKE_S 0x34B
-#define MOVE_G_MAX_TERROR_P 0x34C
-#define MOVE_G_MAX_TERROR_S 0x34D
-#define MOVE_G_MAX_FOAM_BURST_P 0x34E
-#define MOVE_G_MAX_FOAM_BURST_S 0x34F
-#define MOVE_G_MAX_RESONANCE_P 0x350
-#define MOVE_G_MAX_RESONANCE_S 0x351
-#define MOVE_G_MAX_CUDDLE_P 0x352
-#define MOVE_G_MAX_CUDDLE_S 0x353
-#define MOVE_G_MAX_REPLENISH_P 0x354
-#define MOVE_G_MAX_REPLENISH_S 0x355
-#define MOVE_G_MAX_MALODOR_P 0x356
-#define MOVE_G_MAX_MALODOR_S 0x357
-#define MOVE_G_MAX_MELTDOWN_P 0x358
-#define MOVE_G_MAX_MELTDOWN_S 0x359
-#define MOVE_G_MAX_DRUM_SOLO_P 0x35A
-#define MOVE_G_MAX_DRUM_SOLO_S 0x35B
-#define MOVE_G_MAX_FIREBALL_P 0x35C
-#define MOVE_G_MAX_FIREBALL_S 0x35D
-#define MOVE_G_MAX_HYDROSNIPE_P 0x35E
-#define MOVE_G_MAX_HYDROSNIPE_S 0x35F
-#define MOVE_G_MAX_WIND_RAGE_P 0x360
-#define MOVE_G_MAX_WIND_RAGE_S 0x361
-#define MOVE_G_MAX_GRAVITAS_P 0x362
-#define MOVE_G_MAX_GRAVITAS_S 0x363
-#define MOVE_G_MAX_STONESURGE_P 0x364
-#define MOVE_G_MAX_STONESURGE_S 0x365
-#define MOVE_G_MAX_VOLCALITH_P 0x366
-#define MOVE_G_MAX_VOLCALITH_S 0x367
-#define MOVE_G_MAX_TARTNESS_P 0x368
-#define MOVE_G_MAX_TARTNESS_S 0x369
-#define MOVE_G_MAX_SWEETNESS_P 0x36A
-#define MOVE_G_MAX_SWEETNESS_S 0x36B
-#define MOVE_G_MAX_SANDBLAST_P 0x36C
-#define MOVE_G_MAX_SANDBLAST_S 0x36D
-#define MOVE_G_MAX_STUN_SHOCK_P 0x36E
-#define MOVE_G_MAX_STUN_SHOCK_S 0x36F
-#define MOVE_G_MAX_CENTIFERNO_P 0x370
-#define MOVE_G_MAX_CENTIFERNO_S 0x371
-#define MOVE_G_MAX_SMITE_P 0x372
-#define MOVE_G_MAX_SMITE_S 0x373
-#define MOVE_G_MAX_SNOOZE_P 0x374
-#define MOVE_G_MAX_SNOOZE_S 0x375
-#define MOVE_G_MAX_FINALE_P 0x376
-#define MOVE_G_MAX_FINALE_S 0x377
-#define MOVE_G_MAX_STEELSURGE_P 0x378
-#define MOVE_G_MAX_STEELSURGE_S 0x379
-#define MOVE_G_MAX_DEPLETION_P 0x37A
-#define MOVE_G_MAX_DEPLETION_S 0x37B
-#define MOVE_G_MAX_ONE_BLOW_P 0x37C
-#define MOVE_G_MAX_ONE_BLOW_S 0x37D
-#define MOVE_G_MAX_RAPID_FLOW_P 0x37E
-#define MOVE_G_MAX_RAPID_FLOW_S 0x37F
+#define MOVE_MAX_GUARD 0x31C
+#define MOVE_MAX_STRIKE_P 0x31D
+#define MOVE_MAX_STRIKE_S 0x31E
+#define MOVE_MAX_KNUCKLE_P 0x31F
+#define MOVE_MAX_KNUCKLE_S 0x320
+#define MOVE_MAX_AIRSTREAM_P 0x321
+#define MOVE_MAX_AIRSTREAM_S 0x322
+#define MOVE_MAX_OOZE_P 0x323
+#define MOVE_MAX_OOZE_S 0x324
+#define MOVE_MAX_QUAKE_P 0x325
+#define MOVE_MAX_QUAKE_S 0x326
+#define MOVE_MAX_ROCKFALL_P 0x327
+#define MOVE_MAX_ROCKFALL_S 0x328
+#define MOVE_MAX_FLUTTERBY_P 0x329
+#define MOVE_MAX_FLUTTERBY_S 0x32A
+#define MOVE_MAX_PHANTASM_P 0x32B
+#define MOVE_MAX_PHANTASM_S 0x32C
+#define MOVE_MAX_STEELSPIKE_P 0x32D
+#define MOVE_MAX_STEELSPIKE_S 0x32E
+#define MOVE_MAX_FLARE_P 0x32F
+#define MOVE_MAX_FLARE_S 0x330
+#define MOVE_MAX_GEYSER_P 0x331
+#define MOVE_MAX_GEYSER_S 0x332
+#define MOVE_MAX_OVERGROWTH_P 0x333
+#define MOVE_MAX_OVERGROWTH_S 0x334
+#define MOVE_MAX_LIGHTNING_P 0x335
+#define MOVE_MAX_LIGHTNING_S 0x336
+#define MOVE_MAX_MINDSTORM_P 0x337
+#define MOVE_MAX_MINDSTORM_S 0x338
+#define MOVE_MAX_HAILSTORM_P 0x339
+#define MOVE_MAX_HAILSTORM_S 0x33A
+#define MOVE_MAX_WYRMWIND_P 0x33B
+#define MOVE_MAX_WYRMWIND_S 0x33C
+#define MOVE_MAX_DARKNESS_P 0x33D
+#define MOVE_MAX_DARKNESS_S 0x33E
+#define MOVE_MAX_STARFALL_P 0x33F
+#define MOVE_MAX_STARFALL_S 0x340
+#define MOVE_G_MAX_VINE_LASH_P 0x341
+#define MOVE_G_MAX_VINE_LASH_S 0x342
+#define MOVE_G_MAX_WILDFIRE_P 0x343
+#define MOVE_G_MAX_WILDFIRE_S 0x344
+#define MOVE_G_MAX_CANNONADE_P 0x345
+#define MOVE_G_MAX_CANNONADE_S 0x346
+#define MOVE_G_MAX_BEFUDDLE_P 0x347
+#define MOVE_G_MAX_BEFUDDLE_S 0x348
+#define MOVE_G_MAX_VOLT_CRASH_P 0x349
+#define MOVE_G_MAX_VOLT_CRASH_S 0x34A
+#define MOVE_G_MAX_GOLD_RUSH_P 0x34B
+#define MOVE_G_MAX_GOLD_RUSH_S 0x34C
+#define MOVE_G_MAX_CHI_STRIKE_P 0x34D
+#define MOVE_G_MAX_CHI_STRIKE_S 0x34E
+#define MOVE_G_MAX_TERROR_P 0x34F
+#define MOVE_G_MAX_TERROR_S 0x350
+#define MOVE_G_MAX_FOAM_BURST_P 0x351
+#define MOVE_G_MAX_FOAM_BURST_S 0x352
+#define MOVE_G_MAX_RESONANCE_P 0x353
+#define MOVE_G_MAX_RESONANCE_S 0x354
+#define MOVE_G_MAX_CUDDLE_P 0x355
+#define MOVE_G_MAX_CUDDLE_S 0x356
+#define MOVE_G_MAX_REPLENISH_P 0x357
+#define MOVE_G_MAX_REPLENISH_S 0x358
+#define MOVE_G_MAX_MALODOR_P 0x359
+#define MOVE_G_MAX_MALODOR_S 0x35A
+#define MOVE_G_MAX_MELTDOWN_P 0x35B
+#define MOVE_G_MAX_MELTDOWN_S 0x35C
+#define MOVE_G_MAX_DRUM_SOLO_P 0x35D
+#define MOVE_G_MAX_DRUM_SOLO_S 0x35E
+#define MOVE_G_MAX_FIREBALL_P 0x35F
+#define MOVE_G_MAX_FIREBALL_S 0x360
+#define MOVE_G_MAX_HYDROSNIPE_P 0x361
+#define MOVE_G_MAX_HYDROSNIPE_S 0x362
+#define MOVE_G_MAX_WIND_RAGE_P 0x363
+#define MOVE_G_MAX_WIND_RAGE_S 0x364
+#define MOVE_G_MAX_GRAVITAS_P 0x365
+#define MOVE_G_MAX_GRAVITAS_S 0x366
+#define MOVE_G_MAX_STONESURGE_P 0x367
+#define MOVE_G_MAX_STONESURGE_S 0x368
+#define MOVE_G_MAX_VOLCALITH_P 0x369
+#define MOVE_G_MAX_VOLCALITH_S 0x36A
+#define MOVE_G_MAX_TARTNESS_P 0x36B
+#define MOVE_G_MAX_TARTNESS_S 0x36C
+#define MOVE_G_MAX_SWEETNESS_P 0x36D
+#define MOVE_G_MAX_SWEETNESS_S 0x36E
+#define MOVE_G_MAX_SANDBLAST_P 0x36F
+#define MOVE_G_MAX_SANDBLAST_S 0x370
+#define MOVE_G_MAX_STUN_SHOCK_P 0x371
+#define MOVE_G_MAX_STUN_SHOCK_S 0x372
+#define MOVE_G_MAX_CENTIFERNO_P 0x373
+#define MOVE_G_MAX_CENTIFERNO_S 0x374
+#define MOVE_G_MAX_SMITE_P 0x375
+#define MOVE_G_MAX_SMITE_S 0x376
+#define MOVE_G_MAX_SNOOZE_P 0x377
+#define MOVE_G_MAX_SNOOZE_S 0x378
+#define MOVE_G_MAX_FINALE_P 0x379
+#define MOVE_G_MAX_FINALE_S 0x37A
+#define MOVE_G_MAX_STEELSURGE_P 0x37B
+#define MOVE_G_MAX_STEELSURGE_S 0x37C
+#define MOVE_G_MAX_DEPLETION_P 0x37D
+#define MOVE_G_MAX_DEPLETION_S 0x37E
+#define MOVE_G_MAX_ONE_BLOW_P 0x37F
+#define MOVE_G_MAX_ONE_BLOW_S 0x380
+#define MOVE_G_MAX_RAPID_FLOW_P 0x381
+#define MOVE_G_MAX_RAPID_FLOW_S 0x382
 
 #define FIRST_MAX_MOVE      MOVE_MAX_GUARD
 #define LAST_MAX_MOVE       MOVE_MAX_STARFALL_S
@@ -916,4 +919,4 @@
 
 #define LAST_MOVE_INDEX     MOVE_G_MAX_RAPID_FLOW_S
 #define MOVES_COUNT        (MOVE_G_MAX_RAPID_FLOW_S + 1)
-#define NON_Z_MOVE_COUNT   (MOVE_DRAGONENERGY + 1)
+#define NON_Z_MOVE_COUNT   (MOVE_GLACIALLANCE + 1)
diff --git a/include/species.h b/include/species.h
index 1c3d793..51a7442 100644
--- a/include/species.h
+++ b/include/species.h
@@ -1176,86 +1176,89 @@
 #define SPECIES_KUBFU 0x49F
 #define SPECIES_URSHIFU_SINGLE 0x4A0
 #define SPECIES_ZARUDE 0x4A1
-#define SPECIES_UNKNOWN_MYTHICAL 0x4A2
-#define SPECIES_CALYREX 0x4A3
-#define SPECIES_REGIELEKI 0x4A4
-#define SPECIES_REGIDRAGO 0x4A5
+#define SPECIES_REGIELEKI 0x4A2
+#define SPECIES_REGIDRAGO 0x4A3
+#define SPECIES_GLASTRIER 0x4A4
+#define SPECIES_SPECTRIER 0x4A5
+#define SPECIES_CALYREX 0x4A6
 
-#define SPECIES_CRAMORANT_GULPING 0x4A6
-#define SPECIES_CRAMORANT_GORGING 0x4A7
-#define SPECIES_TOXTRICITY_LOW_KEY 0x4A8
-#define SPECIES_SINISTEA_CHIPPED 0x4A9
-#define SPECIES_POLTEAGEIST_CHIPPED 0x4AA
-#define SPECIES_ALCREMIE_BERRY 0x4AB
-#define SPECIES_ALCREMIE_CLOVER 0x4AC
-#define SPECIES_ALCREMIE_FLOWER 0x4AD
-#define SPECIES_ALCREMIE_LOVE 0x4AE
-#define SPECIES_ALCREMIE_RIBBON 0x4AF
-#define SPECIES_ALCREMIE_STAR 0x4B0
-#define SPECIES_EISCUE_NOICE 0x4B1
-#define SPECIES_INDEEDEE_FEMALE 0x4B2
-#define SPECIES_MORPEKO_HANGRY 0x4B3
-#define SPECIES_ZACIAN_CROWNED 0x4B4
-#define SPECIES_ZAMAZENTA_CROWNED 0x4B5
-#define SPECIES_ETERNATUS_ETERNAMAX 0x4B6
-#define SPECIES_URSHIFU_RAPID 0x4B7
+#define SPECIES_CRAMORANT_GULPING 0x4A7
+#define SPECIES_CRAMORANT_GORGING 0x4A8
+#define SPECIES_TOXTRICITY_LOW_KEY 0x4A9
+#define SPECIES_SINISTEA_CHIPPED 0x4AA
+#define SPECIES_POLTEAGEIST_CHIPPED 0x4AB
+#define SPECIES_ALCREMIE_BERRY 0x4AC
+#define SPECIES_ALCREMIE_CLOVER 0x4AD
+#define SPECIES_ALCREMIE_FLOWER 0x4AE
+#define SPECIES_ALCREMIE_LOVE 0x4AF
+#define SPECIES_ALCREMIE_RIBBON 0x4B0
+#define SPECIES_ALCREMIE_STAR 0x4B1
+#define SPECIES_EISCUE_NOICE 0x4B2
+#define SPECIES_INDEEDEE_FEMALE 0x4B3
+#define SPECIES_MORPEKO_HANGRY 0x4B4
+#define SPECIES_ZACIAN_CROWNED 0x4B5
+#define SPECIES_ZAMAZENTA_CROWNED 0x4B6
+#define SPECIES_ETERNATUS_ETERNAMAX 0x4B7
+#define SPECIES_URSHIFU_RAPID 0x4B8
+#define SPECIES_CALYREX_ICE_RIDER 0x4B9
+#define SPECIES_CALYREX_SHADOW_RIDER 0x4BA
 
-#define SPECIES_MEOWTH_G 0x4B8
-#define SPECIES_PONYTA_G 0x4B9
-#define SPECIES_RAPIDASH_G 0x4BA
-#define SPECIES_SLOWPOKE_G 0x4BB
-#define SPECIES_SLOWBRO_G 0x4BC
-#define SPECIES_FARFETCHD_G 0x4BD
-#define SPECIES_KOFFING_G 0x4BE
-#define SPECIES_WEEZING_G 0x4BF
-#define SPECIES_MR_MIME_G 0x4C0
-#define SPECIES_ARTICUNO_G 0x4C1
-#define SPECIES_ZAPDOS_G 0x4C2
-#define SPECIES_MOLTRES_G 0x4C3
-#define SPECIES_SLOWKING_G 0x4C4
-#define SPECIES_CORSOLA_G 0x4C5
-#define SPECIES_ZIGZAGOON_G 0x4C6
-#define SPECIES_LINOONE_G 0x4C7
-#define SPECIES_MIME_JR_G 0x4C8
-#define SPECIES_DARUMAKA_G 0x4C9
-#define SPECIES_DARMANITAN_G 0x4CA
-#define SPECIES_DARMANITAN_G_ZEN 0x4CB
-#define SPECIES_YAMASK_G 0x4CC
-#define SPECIES_STUNFISK_G 0x4CD
+#define SPECIES_MEOWTH_G 0x4BB
+#define SPECIES_PONYTA_G 0x4BC
+#define SPECIES_RAPIDASH_G 0x4BD
+#define SPECIES_SLOWPOKE_G 0x4BE
+#define SPECIES_SLOWBRO_G 0x4BF
+#define SPECIES_FARFETCHD_G 0x4C0
+#define SPECIES_KOFFING_G 0x4C1
+#define SPECIES_WEEZING_G 0x4C2
+#define SPECIES_MR_MIME_G 0x4C3
+#define SPECIES_ARTICUNO_G 0x4C4
+#define SPECIES_ZAPDOS_G 0x4C5
+#define SPECIES_MOLTRES_G 0x4C6
+#define SPECIES_SLOWKING_G 0x4C7
+#define SPECIES_CORSOLA_G 0x4C8
+#define SPECIES_ZIGZAGOON_G 0x4C9
+#define SPECIES_LINOONE_G 0x4CA
+#define SPECIES_MIME_JR_G 0x4CB
+#define SPECIES_DARUMAKA_G 0x4CC
+#define SPECIES_DARMANITAN_G 0x4CD
+#define SPECIES_DARMANITAN_G_ZEN 0x4CE
+#define SPECIES_YAMASK_G 0x4CF
+#define SPECIES_STUNFISK_G 0x4D0
 
-#define SPECIES_VENUSAUR_GIGA 0x4CE
-#define SPECIES_CHARIZARD_GIGA 0x4CF
-#define SPECIES_BLASTOISE_GIGA 0x4D0
-#define SPECIES_BUTTERFREE_GIGA 0x4D1
-#define SPECIES_PIKACHU_GIGA 0x4D2
-#define SPECIES_MEOWTH_GIGA 0x4D3
-#define SPECIES_MACHAMP_GIGA 0x4D4
-#define SPECIES_GENGAR_GIGA 0x4D5
-#define SPECIES_KINGLER_GIGA 0x4D6
-#define SPECIES_LAPRAS_GIGA 0x4D7
-#define SPECIES_EEVEE_GIGA 0x4D8
-#define SPECIES_SNORLAX_GIGA 0x4D9
-#define SPECIES_GARBODOR_GIGA 0x4DA
-#define SPECIES_MELMETAL_GIGA 0x4DB
-#define SPECIES_RILLABOOM_GIGA 0x4DC
-#define SPECIES_CINDERACE_GIGA 0x4DD
-#define SPECIES_INTELEON_GIGA 0x4DE
-#define SPECIES_CORVIKNIGHT_GIGA 0x4DF
-#define SPECIES_ORBEETLE_GIGA 0x4E0
-#define SPECIES_DREDNAW_GIGA 0x4E1
-#define SPECIES_COALOSSAL_GIGA 0x4E2
-#define SPECIES_FLAPPLE_GIGA 0x4E3
-#define SPECIES_APPLETUN_GIGA 0x4E4
-#define SPECIES_SANDACONDA_GIGA 0x4E5
-#define SPECIES_TOXTRICITY_GIGA 0x4E6
-#define SPECIES_TOXTRICITY_LOW_KEY_GIGA 0x4E7
-#define SPECIES_CENTISKORCH_GIGA 0x4E8
-#define SPECIES_HATTERENE_GIGA 0x4E9
-#define SPECIES_GRIMMSNARL_GIGA 0x4EA
-#define SPECIES_ALCREMIE_GIGA 0x4EB
-#define SPECIES_COPPERAJAH_GIGA 0x4EC
-#define SPECIES_DURALUDON_GIGA 0x4ED
-#define SPECIES_URSHIFU_SINGLE_GIGA 0x4EE
-#define SPECIES_URSHIFU_RAPID_GIGA 0x4EF
+#define SPECIES_VENUSAUR_GIGA 0x4D1
+#define SPECIES_CHARIZARD_GIGA 0x4D2
+#define SPECIES_BLASTOISE_GIGA 0x4D3
+#define SPECIES_BUTTERFREE_GIGA 0x4D4
+#define SPECIES_PIKACHU_GIGA 0x4D5
+#define SPECIES_MEOWTH_GIGA 0x4D6
+#define SPECIES_MACHAMP_GIGA 0x4D7
+#define SPECIES_GENGAR_GIGA 0x4D8
+#define SPECIES_KINGLER_GIGA 0x4D9
+#define SPECIES_LAPRAS_GIGA 0x4DA
+#define SPECIES_EEVEE_GIGA 0x4DB
+#define SPECIES_SNORLAX_GIGA 0x4DC
+#define SPECIES_GARBODOR_GIGA 0x4DD
+#define SPECIES_MELMETAL_GIGA 0x4DE
+#define SPECIES_RILLABOOM_GIGA 0x4DF
+#define SPECIES_CINDERACE_GIGA 0x4E0
+#define SPECIES_INTELEON_GIGA 0x4E1
+#define SPECIES_CORVIKNIGHT_GIGA 0x4E2
+#define SPECIES_ORBEETLE_GIGA 0x4E3
+#define SPECIES_DREDNAW_GIGA 0x4E4
+#define SPECIES_COALOSSAL_GIGA 0x4E5
+#define SPECIES_FLAPPLE_GIGA 0x4E6
+#define SPECIES_APPLETUN_GIGA 0x4E7
+#define SPECIES_SANDACONDA_GIGA 0x4E8
+#define SPECIES_TOXTRICITY_GIGA 0x4E9
+#define SPECIES_TOXTRICITY_LOW_KEY_GIGA 0x4EA
+#define SPECIES_CENTISKORCH_GIGA 0x4EB
+#define SPECIES_HATTERENE_GIGA 0x4EC
+#define SPECIES_GRIMMSNARL_GIGA 0x4ED
+#define SPECIES_ALCREMIE_GIGA 0x4EE
+#define SPECIES_COPPERAJAH_GIGA 0x4EF
+#define SPECIES_DURALUDON_GIGA 0x4F0
+#define SPECIES_URSHIFU_SINGLE_GIGA 0x4F1
+#define SPECIES_URSHIFU_RAPID_GIGA 0x4F2
 
 #define NUM_SPECIES (SPECIES_URSHIFU_RAPID_GIGA + 1)
diff --git a/src/Back_Pic_Coords_Table.c b/src/Back_Pic_Coords_Table.c
index 57ef71a..18cca6e 100644
--- a/src/Back_Pic_Coords_Table.c
+++ b/src/Back_Pic_Coords_Table.c
@@ -4191,12 +4191,12 @@ const struct MonCoords gMonBackPicCoords[NUM_SPECIES] =
 	[SPECIES_ZYGARDE_10] =
 	{
 		.size = 0x0,
-		.y_offset = 0x5,
+		.y_offset = 0x8,
 	},
 	[SPECIES_ZYGARDE_COMPLETE] =
 	{
 		.size = 0x0,
-		.y_offset = 0x0,
+		.y_offset = 0x3,
 	},
 	[SPECIES_ASHGRENINJA] =
 	{
@@ -5081,7 +5081,7 @@ const struct MonCoords gMonBackPicCoords[NUM_SPECIES] =
 	[SPECIES_KARTANA] =
 	{
 		.size = 0x0,
-		.y_offset = 0xd,
+		.y_offset = 0xB,
 	},
 	[SPECIES_GUZZLORD] =
 	{
@@ -5928,17 +5928,7 @@ const struct MonCoords gMonBackPicCoords[NUM_SPECIES] =
 		.size = 0x0,
 		.y_offset = 0x0,
 	},
-		[SPECIES_ZARUDE] =
-	{
-		.size = 0x0,
-		.y_offset = 0x0,
-	},
-	[SPECIES_UNKNOWN_MYTHICAL] =
-	{
-		.size = 0x0,
-		.y_offset = 0x0,
-	},
-	[SPECIES_CALYREX] =
+	[SPECIES_ZARUDE] =
 	{
 		.size = 0x0,
 		.y_offset = 0x0,
@@ -5953,6 +5943,21 @@ const struct MonCoords gMonBackPicCoords[NUM_SPECIES] =
 		.size = 0x0,
 		.y_offset = 0x0,
 	},
+	[SPECIES_GLASTRIER] =
+	{
+		.size = 0x0,
+		.y_offset = 0x0,
+	},
+	[SPECIES_SPECTRIER] =
+	{
+		.size = 0x0,
+		.y_offset = 0x0,
+	},
+	[SPECIES_CALYREX] =
+	{
+		.size = 0x0,
+		.y_offset = 0x0,
+	},
 	[SPECIES_CRAMORANT_GULPING] =
 	{
 		.size = 0x0,
diff --git a/src/Enemy_Elevation_Table.c b/src/Enemy_Elevation_Table.c
index 07ae47f..72a509e 100644
--- a/src/Enemy_Elevation_Table.c
+++ b/src/Enemy_Elevation_Table.c
@@ -648,7 +648,7 @@ const u8 gEnemyMonElevation[NUM_SPECIES] =
 	[SPECIES_FOONGUS] = 0x0,
 	[SPECIES_AMOONGUSS] = 0x0,
 	[SPECIES_FRILLISH] = 0x0,
-	[SPECIES_JELLICENT] = 0x0,
+	[SPECIES_JELLICENT] = 0x8,
 	[SPECIES_ALOMOMOLA] = 0x0,
 	[SPECIES_JOLTIK] = 0x0,
 	[SPECIES_GALVANTULA] = 0x0,
@@ -707,7 +707,7 @@ const u8 gEnemyMonElevation[NUM_SPECIES] =
 	[SPECIES_GENESECT] = 0x0,
 	[SPECIES_UNFEZANT_F] = 0x0,
 	[SPECIES_FRILLISH_F] = 0x0,
-	[SPECIES_JELLICENT_F] = 0x0,
+	[SPECIES_JELLICENT_F] = 0x8,
 	[SPECIES_SHADOW_WARRIOR] = 0x0,
 	[SPECIES_BURMY_SANDY] = 0x0,
 	[SPECIES_BURMY_TRASH] = 0x0,
@@ -1017,7 +1017,7 @@ const u8 gEnemyMonElevation[NUM_SPECIES] =
 	[SPECIES_PHEROMOSA] = 0x0,
 	[SPECIES_XURKITREE] = 0x0,
 	[SPECIES_CELESTEELA] = 0x0,
-	[SPECIES_KARTANA] = 0x0,
+	[SPECIES_KARTANA] = 0x8,
 	[SPECIES_GUZZLORD] = 0x0,
 	[SPECIES_NECROZMA] = 0x0,
 	[SPECIES_MAGEARNA] = 0x0,
@@ -1188,10 +1188,11 @@ const u8 gEnemyMonElevation[NUM_SPECIES] =
 	[SPECIES_KUBFU] = 0x0,
 	[SPECIES_URSHIFU_SINGLE] = 0x0,
 	[SPECIES_ZARUDE] = 0x0,
-	[SPECIES_UNKNOWN_MYTHICAL] = 0x0,
-	[SPECIES_CALYREX] = 0x0,
 	[SPECIES_REGIELEKI] = 0x0,
 	[SPECIES_REGIDRAGO] = 0x0,
+	[SPECIES_GLASTRIER] = 0x0,
+	[SPECIES_SPECTRIER] = 0x0,
+	[SPECIES_CALYREX] = 0x0,
 	[SPECIES_CRAMORANT_GULPING] = 0x0,
 	[SPECIES_CRAMORANT_GORGING] = 0x0,
 	[SPECIES_TOXTRICITY_LOW_KEY] = 0x0,
diff --git a/src/Front_Pic_Coords_Table.c b/src/Front_Pic_Coords_Table.c
index 6a6d8e4..fec2692 100644
--- a/src/Front_Pic_Coords_Table.c
+++ b/src/Front_Pic_Coords_Table.c
@@ -3836,7 +3836,7 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES] =
 	[SPECIES_GRENINJA] =
 	{
 		.size = 0x0,
-		.y_offset = 0x1,
+		.y_offset = 0x5,
 	},
 	[SPECIES_BUNNELBY] =
 	{
@@ -4116,7 +4116,7 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES] =
 	[SPECIES_NOIBAT] =
 	{
 		.size = 0x0,
-		.y_offset = 0x8,
+		.y_offset = 0x9,
 	},
 	[SPECIES_NOIVERN] =
 	{
@@ -4191,7 +4191,7 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES] =
 	[SPECIES_ZYGARDE_10] =
 	{
 		.size = 0x0,
-		.y_offset = 0x4,
+		.y_offset = 0x3,
 	},
 	[SPECIES_ZYGARDE_COMPLETE] =
 	{
@@ -4201,7 +4201,7 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES] =
 	[SPECIES_ASHGRENINJA] =
 	{
 		.size = 0x0,
-		.y_offset = 0x4,
+		.y_offset = 0x5,
 	},
 	[SPECIES_FLABEBE_BLUE] =
 	{
@@ -5081,7 +5081,7 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES] =
 	[SPECIES_KARTANA] =
 	{
 		.size = 0x0,
-		.y_offset = 0x3,
+		.y_offset = 0xB,
 	},
 	[SPECIES_GUZZLORD] =
 	{
@@ -5116,12 +5116,12 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES] =
 	[SPECIES_RAICHU_A] =
 	{
 		.size = 0x0,
-		.y_offset = 0x0,
+		.y_offset = 0x1,
 	},
 	[SPECIES_SANDSHREW_A] =
 	{
 		.size = 0x0,
-		.y_offset = 0x7,
+		.y_offset = 13,
 	},
 	[SPECIES_SANDSLASH_A] =
 	{
@@ -5933,7 +5933,22 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES] =
 		.size = 0x0,
 		.y_offset = 0x0,
 	},
-	[SPECIES_UNKNOWN_MYTHICAL] =
+	[SPECIES_REGIELEKI] =
+	{
+		.size = 0x0,
+		.y_offset = 0x0,
+	},
+	[SPECIES_REGIDRAGO] =
+	{
+		.size = 0x0,
+		.y_offset = 0x0,
+	},
+	[SPECIES_GLASTRIER] =
+	{
+		.size = 0x0,
+		.y_offset = 0x0,
+	},
+	[SPECIES_SPECTRIER] =
 	{
 		.size = 0x0,
 		.y_offset = 0x0,
diff --git a/src/Icon_Palette_Table.c b/src/Icon_Palette_Table.c
index 6f49089..bd09585 100644
--- a/src/Icon_Palette_Table.c
+++ b/src/Icon_Palette_Table.c
@@ -1188,10 +1188,11 @@ const u8 gMonIconPaletteIndices[NUM_SPECIES] =
 	[SPECIES_KUBFU] = 0x0,
 	[SPECIES_URSHIFU_SINGLE] = 0x0,
 	[SPECIES_ZARUDE] = 0x0,
-	[SPECIES_UNKNOWN_MYTHICAL] = 0x0,
-	[SPECIES_CALYREX] = 0x0,
 	[SPECIES_REGIELEKI] = 0x0,
 	[SPECIES_REGIDRAGO] = 0x0,
+	[SPECIES_SPECTRIER] = 0x0,
+	[SPECIES_GLASTRIER] = 0x0,
+	[SPECIES_CALYREX] = 0x0,
 	[SPECIES_CRAMORANT_GULPING] = 0x0,
 	[SPECIES_CRAMORANT_GORGING] = 0x0,
 	[SPECIES_TOXTRICITY_LOW_KEY] = 0x0,
diff --git a/src/Item_Animation_Table.c b/src/Item_Animation_Table.c
index d051421..f2740e1 100644
--- a/src/Item_Animation_Table.c
+++ b/src/Item_Animation_Table.c
@@ -1197,10 +1197,11 @@ const struct ItemAnimation gItemAnimationTable[NUM_SPECIES] =
 	[SPECIES_KUBFU] =                {0x0, 0x0, 0x0, 0x0, 0x0},
 	[SPECIES_URSHIFU_SINGLE] =       {0x0, 0x0, 0x0, 0x0, 0x0},
 	[SPECIES_ZARUDE] =               {0x0, 0x0, 0x0, 0x0, 0x0},
-	[SPECIES_UNKNOWN_MYTHICAL] =     {0x0, 0x0, 0x0, 0x0, 0x0},
-	[SPECIES_CALYREX] =              {0x0, 0x0, 0x0, 0x0, 0x0},
 	[SPECIES_REGIELEKI] =            {0x0, 0x0, 0x0, 0x0, 0x0},
 	[SPECIES_REGIDRAGO] =            {0x0, 0x0, 0x0, 0x0, 0x0},
+	[SPECIES_GLASTRIER] =            {0x0, 0x0, 0x0, 0x0, 0x0},
+	[SPECIES_SPECTRIER] =            {0x0, 0x0, 0x0, 0x0, 0x0},
+	[SPECIES_CALYREX] =              {0x0, 0x0, 0x0, 0x0, 0x0},
 	[SPECIES_CRAMORANT_GULPING] =    {0x0, 0x0, 0x0, 0x0, 0x0},
 	[SPECIES_CRAMORANT_GORGING] =    {0x0, 0x0, 0x0, 0x0, 0x0},
 	[SPECIES_TOXTRICITY_LOW_KEY] =   {0x0, 0x0, 0x0, 0x0, 0x0},
diff --git a/src/Species_To_Pokdex_Table.c b/src/Species_To_Pokdex_Table.c
index 35a6e16..c79ca07 100644
--- a/src/Species_To_Pokdex_Table.c
+++ b/src/Species_To_Pokdex_Table.c
@@ -870,7 +870,7 @@ const u16 gSpeciesToNationalPokedexNum[NUM_SPECIES - 1] =
 	[SPECIES_FURFROU_MATRON - 1] = NATIONAL_DEX_FURFROU,
 	[SPECIES_FURFROU_DANDY - 1] = NATIONAL_DEX_FURFROU,
 	[SPECIES_FURFROU_DEBUTANTE - 1] = NATIONAL_DEX_FURFROU,
-	[SPECIES_VIVILLON_FANCY - 1] = NATIONAL_DEX_FURFROU,
+	[SPECIES_VIVILLON_FANCY - 1] = NATIONAL_DEX_VIVILLON,
 	[SPECIES_VENUSAUR_MEGA - 1] = NATIONAL_DEX_VENUSAUR,
 	[SPECIES_CHARIZARD_MEGA_X - 1] = NATIONAL_DEX_CHARIZARD,
 	[SPECIES_CHARIZARD_MEGA_Y - 1] = NATIONAL_DEX_CHARIZARD,
diff --git a/src/tm_compatibility/102 - Dazzling Gleam.txt b/src/tm_compatibility/102 - Dazzling Gleam.txt
index 6da0d52..b4dcdb5 100644
--- a/src/tm_compatibility/102 - Dazzling Gleam.txt	
+++ b/src/tm_compatibility/102 - Dazzling Gleam.txt	
@@ -113,6 +113,7 @@ AROMATISSE
 SWIRLIX
 SLURPUFF
 SYLVEON
+DEDENNE
 CARBINK
 KLEFKI
 XERNEAS
diff --git a/src/tm_compatibility/111 - Smack Down.txt b/src/tm_compatibility/111 - Smack Down.txt
index 2c11e8f..774224a 100644
--- a/src/tm_compatibility/111 - Smack Down.txt	
+++ b/src/tm_compatibility/111 - Smack Down.txt	
@@ -113,6 +113,8 @@ PIKIPEK
 TRUMBEAK
 TOUCANNON
 TOXAPEX
+MUDBRAY
+MUDSDALE
 PASSIMIAN
 TURTONATOR
 BUZZWOLE
@@ -120,4 +122,7 @@ CELESTEELA
 GUZZLORD
 MARSHADOW
 STAKATAKA
-BLACEPHALON 
\ No newline at end of file
+BLACEPHALON
+ROLYCOLY
+CARKOL
+COALOSSAL
diff --git a/src/tm_compatibility/118 - Aurora Veil.txt b/src/tm_compatibility/118 - Aurora Veil.txt
index 9a7fce4..9adc847 100644
--- a/src/tm_compatibility/118 - Aurora Veil.txt	
+++ b/src/tm_compatibility/118 - Aurora Veil.txt	
@@ -9,11 +9,17 @@ MEW
 DELIBIRD
 SMOOCHUM
 REGICE
+ABOMASNOW
 GLACEON
 FROSLASS
 VANILLITE
 VANILLISH
 VANILLUXE
 CRYOGONAL
+AMAURA
+AURORUS
 BERGMITE
 AVALUGG
+FROSMOTH
+EISCUE
+ARCTOVISH
diff --git a/src/tm_compatibility/128 - Rock Climb.txt b/src/tm_compatibility/128 - Rock Climb.txt
index 56bf5cb..daab175 100644
--- a/src/tm_compatibility/128 - Rock Climb.txt	
+++ b/src/tm_compatibility/128 - Rock Climb.txt	
@@ -45,6 +45,7 @@ MEGANIUM
 TYPHLOSION
 FERALIGATR
 AMPHAROS
+GLIGAR
 STEELIX
 GRANBULL
 URSARING
@@ -56,6 +57,10 @@ TYRANITAR
 SCEPTILE
 BLAZIKEN
 SWAMPERT
+ZIGZAGOON
+ZIGZAGOON_G
+LINOONE
+LINOONE_G
 LUDICOLO
 VIGOROTH
 SLAKING
@@ -64,6 +69,7 @@ MAKUHITA
 HARIYAMA
 AGGRON
 ZANGOOSE
+METAGROSS
 REGIROCK
 REGICE
 REGISTEEL
@@ -75,6 +81,7 @@ CHIMCHAR
 MONFERNO
 INFERNAPE
 EMPOLEON
+BIDOOF
 BIBAREL
 CRANIDOS
 RAMPARDOS
@@ -92,6 +99,7 @@ RHYPERIOR
 ELECTIVIRE
 MAGMORTAR
 MAMOSWINE
+GLISCOR
 HEATRAN
 REGIGIGAS
 GIRATINA
@@ -199,4 +207,5 @@ KOMMO_O
 BUZZWOLE
 PHEROMOSA
 GUZZLORD
-MELMETAL
\ No newline at end of file
+MELMETAL
+OBSTAGOON
diff --git a/src/tm_compatibility/22 - Solarbeam.txt b/src/tm_compatibility/22 - Solarbeam.txt
index 2460ece..181decd 100644
--- a/src/tm_compatibility/22 - Solarbeam.txt	
+++ b/src/tm_compatibility/22 - Solarbeam.txt	
@@ -8,6 +8,7 @@ BEEDRILL
 CLEFAIRY
 CLEFABLE
 NINETALES
+NINETALES_A
 JIGGLYPUFF
 WIGGLYTUFF
 ODDISH
@@ -219,6 +220,7 @@ DWEBBLE
 CRUSTLE
 SIGILYPH
 GARBODOR
+EMOLGA
 DEERLING
 DEERLING_SUMMER
 DEERLING_AUTUMN
@@ -294,6 +296,7 @@ FLORGES_YELLOW
 FLORGES_WHITE
 SKIDDO
 GOGOAT
+HELIOLISK
 PHANTUMP
 TREVENANT
 PUMPKABOO
@@ -342,4 +345,33 @@ NECROZMA_DAWN_WINGS
 NECROZMA_ULTRA
 MAGEARNA
 MAGEARNA_P
-MELMETAL
\ No newline at end of file
+BLACEPHALON
+MELMETAL
+GROOKEY
+THWACKEY
+RILLABOOM
+DOTTLER
+ORBEETLE
+GOSSIFLEUR
+ELDEGOSS
+COALOSSAL
+FLAPPLE
+APPLETUN
+CENTISKORCH
+MR_RIME
+ALCREMIE_STRAWBERRY
+ALCREMIE_BERRY
+ALCREMIE_CLOVER
+ALCREMIE_FLOWER
+ALCREMIE_LOVE
+ALCREMIE_RIBBON
+ALCREMIE_STAR
+DURALUDON
+DRAGAPULT
+ZAMAZENTA
+ZAMAZENTA_CROWNED
+ETERNATUS
+ZARUDE
+CALYREX
+CALYREX_ICE_RIDER
+CALYREX_SHADOW_RIDER
diff --git a/src/tm_compatibility/43 - Secret Power.txt b/src/tm_compatibility/43 - Secret Power.txt
index bce4d91..4d50d67 100644
--- a/src/tm_compatibility/43 - Secret Power.txt	
+++ b/src/tm_compatibility/43 - Secret Power.txt	
@@ -965,6 +965,5 @@ NECROZMA_DUSK_MANE
 NECROZMA_DAWN_WINGS
 NECROZMA_ULTRA
 LYCANROC_DUSK
-PYUKUMUKU
 MELTAN
 MELMETAL
\ No newline at end of file
diff --git a/src/tm_compatibility/70 - Flash.txt b/src/tm_compatibility/70 - Flash.txt
index 45e5988..ff2e1a2 100644
--- a/src/tm_compatibility/70 - Flash.txt	
+++ b/src/tm_compatibility/70 - Flash.txt	
@@ -22,6 +22,8 @@ PIKACHU_CAP_ALOLA
 PIKACHU_CAP_PARTNER
 RAICHU
 RAICHU_A
+VULPIX_A
+NINETALES_A
 CLEFAIRY
 CLEFABLE
 JIGGLYPUFF
@@ -35,10 +37,14 @@ VENONAT
 VENOMOTH
 MEOWTH
 MEOWTH_A
+MEOWTH_G
 PERSIAN
 PERSIAN_A
+PERRSERKER
 PSYDUCK
 GOLDUCK
+PONYTA_G
+RAPIDASH_G
 ABRA
 KADABRA
 ALAKAZAM
@@ -173,6 +179,7 @@ CHIMECHO
 ABSOL
 SNORUNT
 GLALIE
+BELDUM
 METANG
 METAGROSS
 LATIAS
@@ -441,3 +448,22 @@ NECROZMA_ULTRA
 MAGEARNA
 MAGEARNA_P
 ZERAORA
+HATENNA
+HATTREM
+HATTERENE
+IMPIDIMP
+MORGREM
+GRIMMSNARL
+MR_RIME
+MILCERY
+ALCREMIE_STRAWBERRY
+ALCREMIE_BERRY
+ALCREMIE_CLOVER
+ALCREMIE_FLOWER
+ALCREMIE_LOVE
+ALCREMIE_RIBBON
+ALCREMIE_STAR
+FROSMOTH
+INDEEDEE
+INDEEDEE_FEMALE
+ZAMAZENTA
diff --git a/src/tutor_compatibility/93 - Body Press.txt b/src/tutor_compatibility/93 - Body Press.txt
index ecf7adc..bc58a6d 100644
--- a/src/tutor_compatibility/93 - Body Press.txt	
+++ b/src/tutor_compatibility/93 - Body Press.txt	
@@ -33,6 +33,7 @@ TORKOAL
 CLAYDOL
 WALREIN
 RELICANTH
+METAGROSS
 REGIROCK
 REGISTEEL
 BRONZONG
diff --git a/strings/Pokemon_Name_Table.string b/strings/Pokemon_Name_Table.string
index 0a66aeb..3831751 100644
--- a/strings/Pokemon_Name_Table.string
+++ b/strings/Pokemon_Name_Table.string
@@ -3560,18 +3560,21 @@ Urshifu
 #org @NAME_ZARUDE
 Zarude
 
-#org @NAME_UNKNOWN_MYTHICAL
-??????
-
-#org @NAME_CALYREX
-Calyrex
-
 #org @NAME_REGIELEKI
 Regieleki
 
 #org @NAME_REGIDRAGO
 Regidrago
 
+#org @NAME_GLASTRIER
+Glastrier
+
+#org @NAME_SPECTRIER
+Spectrier
+
+#org @NAME_CALYREX
+Calyrex
+
 #org @NAME_CRAMORANT_GULPING
 Cramorant
 
@@ -3626,6 +3629,12 @@ Eternatus
 #org @NAME_URSHIFU_RAPID
 Urshifu
 
+#org @NAME_CALYREX_ICE
+Calyrex
+
+#org @NAME_CALYREX_SHADOW
+Calyrex
+
 #org @NAME_MEOWTH_G
 Meowth
 

From 6642ca95721cfed1162507444069f1a16b87d267 Mon Sep 17 00:00:00 2001
From: Skeli <sesyl.schweitzer@gmail.com>
Date: Mon, 26 Apr 2021 14:24:09 -0400
Subject: [PATCH 3/9] Update Beedrill Shiny

---
 .../backspr/gBackShinySprite015Beedrill.png     | Bin 893 -> 893 bytes
 .../backspr/gBackShinySprite873BeedrillMega.png | Bin 865 -> 864 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/graphics/backspr/gBackShinySprite015Beedrill.png b/graphics/backspr/gBackShinySprite015Beedrill.png
index 3dddac957cff3c55e960157309eed6dcfed32395..1a49b7706ff3ccf017e86f8a7cbef3e6b5ceaa30 100644
GIT binary patch
delta 59
zcmV-B0L1_O2K@$*EiikKxU9hV`1lwY7}(A5P*`|4DN1u<tj)Clw4C;wdjQ_7Apgxu
RSUH2};P@qjfAg_jAOpc(AMgMG

delta 59
zcmV-B0L1_O2K@$*EiizPxUj(Z`1lwY7}(J8P*`|4Z~%b7DB$?Gxaa^7AfPZ{(0Gve
RSfBvt;P|NoQUbAEAOoE)9c};s

diff --git a/graphics/backspr/gBackShinySprite873BeedrillMega.png b/graphics/backspr/gBackShinySprite873BeedrillMega.png
index 61596a51ada99b9f7527193b2d2c8feee31f021a..ac5efbb402f4eee219a5d0cc6e4acf164a22e16a 100644
GIT binary patch
delta 833
zcmV-H1HSy>2H*yeEPqm3d-(YHsHnI~Qewr`)fgBUI4MfawEtQ;gL7i6oO=M?tRMgY
z0RPQOK_F^b3W+!X00QetL_t(|oYmF6Zrd;r2XGC79)y(h0Hoxu0!684M@wW@!IBv`
zOP3Tz`W!(Db@7%WdO!o2+&faV<&Pl9SRz1>@MqrtC{hlB&wq|E`v8a!Ku9itgmL^U
zzXXC1DnA0mi;%tp{J-A^@d(&eK$u@bTmhj2@tDzpsJQ@cLJ(?y8*>rj43uYpk2L_4
zxVn*NH3;X414)M;Hr+WO5^IDDlGqPNQ(zk<LS)t^cJ36|B}8lijUx;goumx0OF>2u
zTmjf+L23&!8-MT$$g$4?L39da2HBy8U@^vJnVp;f47a2RW*LAqv)ef7Lcr1y0z3(@
zPr)@1EZG?_QvegNL<~QHpmng>Y)*hX0fN=l0ztMJhG8>(nsA1&Mp~;B!Pf!D27td}
zA#*jfsur1`-}_<c`{AJp^ZK|;&_|IL2-0u89e;y7^?!h1jdle<WkvGpz@G=M#)BT&
zThY#|Ri$E;^yA160D?h{oEM3Lpvm6NKXI<c62S^;(3r0hRn?U?PP70PV;j)|mSB0J
z5tN;IgZbY%=cxy<1Sj-nUKLfHmZtjw;F(WBghg1pS^+S|l(57D0IocMhhH(OH!muw
zAGdai)_(%u20p)vr1wKn>(~C-c#uv&Yuf6|u)4j6eS#X>+=6-n_}rwwUTy~fJM)Ga
zVH{FI3eF$Ry1W~(17og%M9L?P^ZnLH<3M@@q0E*3sogerQl0||r&+Cw5$w9w0q$R1
z65k+Ir#y%}sQt(B9W;MZ`q6>l1W3Hvlu%u$bboyU63#HhlGp{<8cvi2TMwj5xpWJV
zPI=HckmN2U0Lmzv9l+j$F~rgqAUAO0EPx6Q;Pb!`OE@k7w5VJc`>rv*3mXEjK7dwG
z+=uOcC(G>tV2Bo9P;6$w-F|PHZao1t-V5yF2Hs9e<ADpJzL#SJ8^Qq%7fk8WNZG)F
z+BzM84S}Eu;c;pBdh41sK5;V%fne5j(4~fxAn{Q5&w)9H_z%WE=1^!vAd>ar00000
LNkvXXu0mjf(5!fR

delta 834
zcmV-I1HJs<2H^&fEPsfAkofrcsHnJ5Sa{IL=olCnIB)>q__%<;D7feV5Fns1V9)>n
z0C<r2SfBv-sDLj300QhuL_t(|oYmFOZ<{a_2XGFEKg1^e18m5y2n^G94A{M*0It%@
zE}c;KcT}C&CAUuH4~*1P_MVLs@}sJHoK>l6{fXcAVVii~XMcyEd;ro9fKM)ffN}gQ
zy96mARD1-86Fz+hxPQM7!U?defH1d2dIk6vgi}Tfg8Bm3iIh<DTkDGuXP`I(e5wJU
zz}2-lt3f!AEQnhCux`%*5m>`tk;r^Fm;=)&NpTy&MrQ65m?hHC02&4uFgQu+W0xtJ
zfOiF8mpQ2nNPkSgD<H!@a|FRD5D8?58Yv4gE=$bh3}Co5MX*Q!#EE%~vo2CtIzWIY
z0iKh04R~vI2J{@j1S}E4kC)QQ>-+u$*b|Vls$3yR`f(il`EJ4)!WwZUV+3DE96bPc
z#e8OKC|RzOlztz^aTvyj+Rv)vQ-VJ7I7bkF8_f9YWq+{)1Zy-M0GZ^`s|9}^xSS4p
zU~WaTEW1*MG8(3l9RLJ_8X3<c2|=U1oqyt7P9?k!YS55(ku0lHX)784tEr7(1xv6j
zQV5Dxzrp<PjPuw5Sb`IJvn=zniVNNT0PxJ`AiyH5={f*f>jIW|0KlaKu=ypUs(+DD
z^|&=lG=B!THgNw+65o$`rCx_;?La&Ojc&>>V|RNG&k1U5GXts_;7c9<dbu3|?DQLE
zgmFj-DL8-Bo8oT74z#`oA|aj>&JSBHv<2}I_#%_)r?QW^72+HSIL&gCPhi(J7I63C
z68HuwTj@aHK;=G;@1W(ARF4*TCqUrUri7|o#($d=5OIbf*2FBpHgKX0*g7C=%C%j9
zw9<jvf+({o0Z>NS;sEvzOd-~$0J(t^X8=^N0QUn!tl_u-P-$tq*tfNIU6>Gf^#L>~
z#pkfy??kaZ01VOK3yLiaxZCe_-EL-}!h3;T+`!vODm-vrFbrafU_w}+;DSk2Xd!Ai
zP&>N=Fd-1sK5UnQueY||;EwBA2n36|g)SAG1c8Toc=q%$#D6gU0p?I>M2>x*Gynhq
M07*qoM6N<$f;TF7mH+?%


From 20a4913432fb9a11e7888caf7bc49915348487d7 Mon Sep 17 00:00:00 2001
From: Skeli <sesyl.schweitzer@gmail.com>
Date: Mon, 26 Apr 2021 14:42:30 -0400
Subject: [PATCH 4/9] Give Bad Pokemon New Abilities & Moves

---
 src/Base_Stats.c                              |  970 ++--
 src/Egg_Moves.c                               |  161 +-
 src/Learnsets.c                               | 4289 +++++++++--------
 src/tm_compatibility/30 - Shadow Ball.txt     |    3 +
 src/tm_compatibility/33 - Reflect.txt         |    2 +
 src/tm_compatibility/46 - Thief.txt           |    1 +
 src/tm_compatibility/62 - Silver Wind.txt     |    3 +
 src/tm_compatibility/99 - Wild Charge.txt     |    2 +
 .../110 - High Horsepower.txt                 |   10 +
 src/tutor_compatibility/115 - Play Rough.txt  |    2 +
 src/tutor_compatibility/117 - Power Gem.txt   |    2 +
 src/tutor_compatibility/123 - Hurricane.txt   |    4 +
 src/tutor_compatibility/2 - Ice Punch.txt     |    6 +
 src/tutor_compatibility/32 - Zen Headbutt.txt |    2 +
 src/tutor_compatibility/33 - Seed Bomb.txt    |    1 +
 src/tutor_compatibility/48 - Earth Power.txt  |    2 +
 src/tutor_compatibility/52 - Hyper Voice.txt  |    1 +
 src/tutor_compatibility/54 - Knock Off.txt    |    2 +
 src/tutor_compatibility/74 - Toxic Spikes.txt |    2 +
 src/tutor_compatibility/77 - Nasty Plot.txt   |    2 +
 src/tutor_compatibility/89 - Thunder Fang.txt |    2 +
 src/tutor_compatibility/90 - Ice Fang.txt     |    3 +
 src/tutor_compatibility/91 - Fire Fang.txt    |    2 +
 23 files changed, 2997 insertions(+), 2477 deletions(-)

diff --git a/src/Base_Stats.c b/src/Base_Stats.c
index 4169b7c..aa72a8c 100644
--- a/src/Base_Stats.c
+++ b/src/Base_Stats.c
@@ -337,7 +337,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_SHIELDDUST,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_RUNAWAY,
+		.hiddenAbility = ABILITY_TECHNICIAN,
 		.noFlip = TRUE,
 	},
 
@@ -434,9 +434,9 @@ const struct BaseStats gBaseStats[] =
 		.eggGroup1 = EGG_GROUP_BUG,
 		.eggGroup2 = EGG_GROUP_BUG,
 		.ability1 = ABILITY_SHIELDDUST,
-		.ability2 = ABILITY_NONE,
+		.ability2 = ABILITY_SHIELDDUST,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_RUNAWAY,
+		.hiddenAbility = ABILITY_TECHNICIAN,
 		.noFlip = TRUE,
 	},
 
@@ -467,7 +467,7 @@ const struct BaseStats gBaseStats[] =
 		.eggGroup1 = EGG_GROUP_BUG,
 		.eggGroup2 = EGG_GROUP_BUG,
 		.ability1 = ABILITY_SHEDSKIN,
-		.ability2 = ABILITY_NONE,
+		.ability2 = ABILITY_SHEDSKIN,
 		.safariZoneFleeRate = 0,
 		.hiddenAbility = ABILITY_SHEDSKIN,
 		.noFlip = TRUE,
@@ -500,9 +500,9 @@ const struct BaseStats gBaseStats[] =
 		.eggGroup1 = EGG_GROUP_BUG,
 		.eggGroup2 = EGG_GROUP_BUG,
 		.ability1 = ABILITY_SWARM,
-		.ability2 = ABILITY_NONE,
+		.ability2 = ABILITY_SNIPER,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_SNIPER,
+		.hiddenAbility = ABILITY_TECHNICIAN,
 		.noFlip = TRUE,
 	},
 
@@ -535,7 +535,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_KEENEYE,
 		.ability2 = ABILITY_TANGLEDFEET,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_BIGPECKS,
+		.hiddenAbility = ABILITY_GALEWINGS,
 		.noFlip = TRUE,
 	},
 
@@ -568,7 +568,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_KEENEYE,
 		.ability2 = ABILITY_TANGLEDFEET,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_BIGPECKS,
+		.hiddenAbility = ABILITY_GALEWINGS,
 		.noFlip = TRUE,
 	},
 
@@ -601,7 +601,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_KEENEYE,
 		.ability2 = ABILITY_TANGLEDFEET,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_BIGPECKS,
+		.hiddenAbility = ABILITY_GALEWINGS,
 		.noFlip = TRUE,
 	},
 
@@ -631,10 +631,10 @@ const struct BaseStats gBaseStats[] =
 		.growthRate = GROWTH_MEDIUM_FAST,
 		.eggGroup1 = EGG_GROUP_FIELD,
 		.eggGroup2 = EGG_GROUP_FIELD,
-		.ability1 = ABILITY_RUNAWAY,
+		.ability1 = ABILITY_HUSTLE,
 		.ability2 = ABILITY_GUTS,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_HUSTLE,
+		.hiddenAbility = ABILITY_STRONGJAW,
 		.noFlip = TRUE,
 	},
 
@@ -664,10 +664,10 @@ const struct BaseStats gBaseStats[] =
 		.growthRate = GROWTH_MEDIUM_FAST,
 		.eggGroup1 = EGG_GROUP_FIELD,
 		.eggGroup2 = EGG_GROUP_FIELD,
-		.ability1 = ABILITY_RUNAWAY,
+		.ability1 = ABILITY_HUSTLE,
 		.ability2 = ABILITY_GUTS,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_HUSTLE,
+		.hiddenAbility = ABILITY_STRONGJAW,
 		.noFlip = TRUE,
 	},
 
@@ -698,9 +698,9 @@ const struct BaseStats gBaseStats[] =
 		.eggGroup1 = EGG_GROUP_FLYING,
 		.eggGroup2 = EGG_GROUP_FLYING,
 		.ability1 = ABILITY_KEENEYE,
-		.ability2 = ABILITY_NONE,
+		.ability2 = ABILITY_SNIPER,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_SNIPER,
+		.hiddenAbility = ABILITY_DEFIANT,
 		.noFlip = TRUE,
 	},
 
@@ -731,9 +731,9 @@ const struct BaseStats gBaseStats[] =
 		.eggGroup1 = EGG_GROUP_FLYING,
 		.eggGroup2 = EGG_GROUP_FLYING,
 		.ability1 = ABILITY_KEENEYE,
-		.ability2 = ABILITY_NONE,
+		.ability2 = ABILITY_SNIPER,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_SNIPER,
+		.hiddenAbility = ABILITY_DEFIANT,
 		.noFlip = TRUE,
 	},
 
@@ -766,7 +766,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_INTIMIDATE,
 		.ability2 = ABILITY_SHEDSKIN,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_UNNERVE,
+		.hiddenAbility = ABILITY_MERCILESS,
 		.noFlip = TRUE,
 	},
 
@@ -799,7 +799,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_INTIMIDATE,
 		.ability2 = ABILITY_SHEDSKIN,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_UNNERVE,
+		.hiddenAbility = ABILITY_MERCILESS,
 		.noFlip = TRUE,
 	},
 
@@ -896,7 +896,7 @@ const struct BaseStats gBaseStats[] =
 		.eggGroup1 = EGG_GROUP_FIELD,
 		.eggGroup2 = EGG_GROUP_FIELD,
 		.ability1 = ABILITY_SANDVEIL,
-		.ability2 = ABILITY_NONE,
+		.ability2 = ABILITY_SANDFORCE,
 		.safariZoneFleeRate = 0,
 		.hiddenAbility = ABILITY_SANDRUSH,
 		.noFlip = TRUE,
@@ -929,7 +929,7 @@ const struct BaseStats gBaseStats[] =
 		.eggGroup1 = EGG_GROUP_FIELD,
 		.eggGroup2 = EGG_GROUP_FIELD,
 		.ability1 = ABILITY_SANDVEIL,
-		.ability2 = ABILITY_NONE,
+		.ability2 = ABILITY_SANDFORCE,
 		.safariZoneFleeRate = 0,
 		.hiddenAbility = ABILITY_SANDRUSH,
 		.noFlip = TRUE,
@@ -1294,7 +1294,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_CUTECHARM,
 		.ability2 = ABILITY_COMPETITIVE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_FRIENDGUARD,
+		.hiddenAbility = ABILITY_DAZZLING,
 		.noFlip = TRUE,
 	},
 
@@ -1327,7 +1327,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_CUTECHARM,
 		.ability2 = ABILITY_COMPETITIVE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_FRISK,
+		.hiddenAbility = ABILITY_DAZZLING,
 		.noFlip = TRUE,
 	},
 
@@ -1525,7 +1525,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_EFFECTSPORE,
 		.ability2 = ABILITY_DRYSKIN,
 		.safariZoneFleeRate = 50,
-		.hiddenAbility = ABILITY_DAMP,
+		.hiddenAbility = ABILITY_TOXICBOOST,
 		.noFlip = TRUE,
 	},
 
@@ -1558,7 +1558,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_EFFECTSPORE,
 		.ability2 = ABILITY_DRYSKIN,
 		.safariZoneFleeRate = 75,
-		.hiddenAbility = ABILITY_DAMP,
+		.hiddenAbility = ABILITY_TOXICBOOST,
 		.noFlip = TRUE,
 	},
 
@@ -1756,7 +1756,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_LIMBER,
 		.ability2 = ABILITY_TECHNICIAN,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_UNNERVE,
+		.hiddenAbility = ABILITY_FURCOAT,
 		.noFlip = TRUE,
 	},
 
@@ -1786,10 +1786,10 @@ const struct BaseStats gBaseStats[] =
 		.growthRate = GROWTH_MEDIUM_FAST,
 		.eggGroup1 = EGG_GROUP_WATER_1,
 		.eggGroup2 = EGG_GROUP_FIELD,
-		.ability1 = ABILITY_DAMP,
+		.ability1 = ABILITY_SWIFTSWIM,
 		.ability2 = ABILITY_CLOUDNINE,
 		.safariZoneFleeRate = 50,
-		.hiddenAbility = ABILITY_SWIFTSWIM,
+		.hiddenAbility = ABILITY_DAMP,
 		.noFlip = TRUE,
 	},
 
@@ -1819,10 +1819,10 @@ const struct BaseStats gBaseStats[] =
 		.growthRate = GROWTH_MEDIUM_FAST,
 		.eggGroup1 = EGG_GROUP_WATER_1,
 		.eggGroup2 = EGG_GROUP_FIELD,
-		.ability1 = ABILITY_DAMP,
+		.ability1 = ABILITY_SWIFTSWIM,
 		.ability2 = ABILITY_CLOUDNINE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_SWIFTSWIM,
+		.hiddenAbility = ABILITY_NEUROFORCE,
 		.noFlip = TRUE,
 	},
 
@@ -2168,7 +2168,7 @@ const struct BaseStats gBaseStats[] =
 		.type2 = TYPE_FIGHTING,
 		.catchRate = 180,
 		.expYield = 75,
-		.evYield_HP 		= 1,
+		.evYield_HP 		= 0,
 		.evYield_Attack 	= 1,
 		.evYield_Defense 	= 0,
 		.evYield_SpAttack 	= 0,
@@ -2185,7 +2185,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_GUTS,
 		.ability2 = ABILITY_NOGUARD,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_STEADFAST,
+		.hiddenAbility = ABILITY_IRONFIST,
 		.noFlip = TRUE,
 	},
 
@@ -2218,7 +2218,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_GUTS,
 		.ability2 = ABILITY_NOGUARD,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_STEADFAST,
+		.hiddenAbility = ABILITY_IRONFIST,
 		.noFlip = TRUE,
 	},
 
@@ -2251,7 +2251,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_GUTS,
 		.ability2 = ABILITY_NOGUARD,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_STEADFAST,
+		.hiddenAbility = ABILITY_IRONFIST,
 		.noFlip = TRUE,
 	},
 
@@ -2282,9 +2282,9 @@ const struct BaseStats gBaseStats[] =
 		.eggGroup1 = EGG_GROUP_GRASS,
 		.eggGroup2 = EGG_GROUP_GRASS,
 		.ability1 = ABILITY_CHLOROPHYLL,
-		.ability2 = ABILITY_NONE,
+		.ability2 = ABILITY_GLUTTONY,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_GLUTTONY,
+		.hiddenAbility = ABILITY_UNNERVE,
 		.noFlip = TRUE,
 	},
 
@@ -2315,9 +2315,9 @@ const struct BaseStats gBaseStats[] =
 		.eggGroup1 = EGG_GROUP_GRASS,
 		.eggGroup2 = EGG_GROUP_GRASS,
 		.ability1 = ABILITY_CHLOROPHYLL,
-		.ability2 = ABILITY_NONE,
+		.ability2 = ABILITY_GLUTTONY,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_GLUTTONY,
+		.hiddenAbility = ABILITY_UNNERVE,
 		.noFlip = TRUE,
 	},
 
@@ -2348,9 +2348,9 @@ const struct BaseStats gBaseStats[] =
 		.eggGroup1 = EGG_GROUP_GRASS,
 		.eggGroup2 = EGG_GROUP_GRASS,
 		.ability1 = ABILITY_CHLOROPHYLL,
-		.ability2 = ABILITY_NONE,
+		.ability2 = ABILITY_GLUTTONY,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_GLUTTONY,
+		.hiddenAbility = ABILITY_CORROSION,
 		.noFlip = TRUE,
 	},
 
@@ -2449,7 +2449,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_ROCKHEAD,
 		.ability2 = ABILITY_STURDY,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_SANDVEIL,
+		.hiddenAbility = ABILITY_SANDSPIT,
 		.noFlip = TRUE,
 	},
 
@@ -2482,7 +2482,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_ROCKHEAD,
 		.ability2 = ABILITY_STURDY,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_SANDVEIL,
+		.hiddenAbility = ABILITY_SANDSPIT,
 		.noFlip = TRUE,
 	},
 
@@ -2515,7 +2515,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_ROCKHEAD,
 		.ability2 = ABILITY_STURDY,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_SANDVEIL,
+		.hiddenAbility = ABILITY_SANDSPIT,
 		.noFlip = TRUE,
 	},
 
@@ -2545,10 +2545,10 @@ const struct BaseStats gBaseStats[] =
 		.growthRate = GROWTH_MEDIUM_FAST,
 		.eggGroup1 = EGG_GROUP_FIELD,
 		.eggGroup2 = EGG_GROUP_FIELD,
-		.ability1 = ABILITY_RUNAWAY,
+		.ability1 = ABILITY_FLAMEBODY,
 		.ability2 = ABILITY_FLASHFIRE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_FLAMEBODY,
+		.hiddenAbility = ABILITY_RECKLESS,
 		.noFlip = TRUE,
 	},
 
@@ -2578,10 +2578,10 @@ const struct BaseStats gBaseStats[] =
 		.growthRate = GROWTH_MEDIUM_FAST,
 		.eggGroup1 = EGG_GROUP_FIELD,
 		.eggGroup2 = EGG_GROUP_FIELD,
-		.ability1 = ABILITY_RUNAWAY,
+		.ability1 = ABILITY_FLAMEBODY,
 		.ability2 = ABILITY_FLASHFIRE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_FLAMEBODY,
+		.hiddenAbility = ABILITY_RECKLESS,
 		.noFlip = TRUE,
 	},
 
@@ -2743,7 +2743,7 @@ const struct BaseStats gBaseStats[] =
 		.growthRate = GROWTH_MEDIUM_FAST,
 		.eggGroup1 = EGG_GROUP_FLYING,
 		.eggGroup2 = EGG_GROUP_FIELD,
-		.ability1 = ABILITY_KEENEYE,
+		.ability1 = ABILITY_SCRAPPY,
 		.ability2 = ABILITY_INNERFOCUS,
 		.safariZoneFleeRate = 0,
 		.hiddenAbility = ABILITY_DEFIANT,
@@ -2776,10 +2776,10 @@ const struct BaseStats gBaseStats[] =
 		.growthRate = GROWTH_MEDIUM_FAST,
 		.eggGroup1 = EGG_GROUP_FLYING,
 		.eggGroup2 = EGG_GROUP_FLYING,
-		.ability1 = ABILITY_RUNAWAY,
+		.ability1 = ABILITY_TANGLEDFEET,
 		.ability2 = ABILITY_EARLYBIRD,
 		.safariZoneFleeRate = 50,
-		.hiddenAbility = ABILITY_TANGLEDFEET,
+		.hiddenAbility = ABILITY_RECKLESS,
 		.noFlip = TRUE,
 	},
 
@@ -2809,10 +2809,10 @@ const struct BaseStats gBaseStats[] =
 		.growthRate = GROWTH_MEDIUM_FAST,
 		.eggGroup1 = EGG_GROUP_FLYING,
 		.eggGroup2 = EGG_GROUP_FLYING,
-		.ability1 = ABILITY_RUNAWAY,
+		.ability1 = ABILITY_TANGLEDFEET,
 		.ability2 = ABILITY_EARLYBIRD,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_TANGLEDFEET,
+		.hiddenAbility = ABILITY_RECKLESS,
 		.noFlip = TRUE,
 	},
 
@@ -2843,9 +2843,9 @@ const struct BaseStats gBaseStats[] =
 		.eggGroup1 = EGG_GROUP_WATER_1,
 		.eggGroup2 = EGG_GROUP_FIELD,
 		.ability1 = ABILITY_THICKFAT,
-		.ability2 = ABILITY_HYDRATION,
+		.ability2 = ABILITY_ICEBODY,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_ICEBODY,
+		.hiddenAbility = ABILITY_ICESCALES,
 		.noFlip = TRUE,
 	},
 
@@ -2876,9 +2876,9 @@ const struct BaseStats gBaseStats[] =
 		.eggGroup1 = EGG_GROUP_WATER_1,
 		.eggGroup2 = EGG_GROUP_FIELD,
 		.ability1 = ABILITY_THICKFAT,
-		.ability2 = ABILITY_HYDRATION,
+		.ability2 = ABILITY_ICEBODY,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_ICEBODY,
+		.hiddenAbility = ABILITY_ICESCALES,
 		.noFlip = TRUE,
 	},
 
@@ -2908,7 +2908,7 @@ const struct BaseStats gBaseStats[] =
 		.growthRate = GROWTH_MEDIUM_FAST,
 		.eggGroup1 = EGG_GROUP_AMORPHOUS,
 		.eggGroup2 = EGG_GROUP_AMORPHOUS,
-		.ability1 = ABILITY_STENCH,
+		.ability1 = ABILITY_GOOEY,
 		.ability2 = ABILITY_STICKYHOLD,
 		.safariZoneFleeRate = 0,
 		.hiddenAbility = ABILITY_POISONTOUCH,
@@ -2941,7 +2941,7 @@ const struct BaseStats gBaseStats[] =
 		.growthRate = GROWTH_MEDIUM_FAST,
 		.eggGroup1 = EGG_GROUP_AMORPHOUS,
 		.eggGroup2 = EGG_GROUP_AMORPHOUS,
-		.ability1 = ABILITY_STENCH,
+		.ability1 = ABILITY_GOOEY,
 		.ability2 = ABILITY_STICKYHOLD,
 		.safariZoneFleeRate = 0,
 		.hiddenAbility = ABILITY_POISONTOUCH,
@@ -3173,9 +3173,9 @@ const struct BaseStats gBaseStats[] =
 		.eggGroup1 = EGG_GROUP_HUMAN_LIKE,
 		.eggGroup2 = EGG_GROUP_HUMAN_LIKE,
 		.ability1 = ABILITY_INSOMNIA,
-		.ability2 = ABILITY_FOREWARN,
+		.ability2 = ABILITY_INNERFOCUS,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_INNERFOCUS,
+		.hiddenAbility = ABILITY_FOREWARN,
 		.noFlip = TRUE,
 	},
 
@@ -3206,9 +3206,9 @@ const struct BaseStats gBaseStats[] =
 		.eggGroup1 = EGG_GROUP_HUMAN_LIKE,
 		.eggGroup2 = EGG_GROUP_HUMAN_LIKE,
 		.ability1 = ABILITY_INSOMNIA,
-		.ability2 = ABILITY_FOREWARN,
+		.ability2 = ABILITY_INNERFOCUS,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_INNERFOCUS,
+		.hiddenAbility = ABILITY_PSYCHICSURGE,
 		.noFlip = TRUE,
 	},
 
@@ -3571,7 +3571,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_OWNTEMPO,
 		.ability2 = ABILITY_OBLIVIOUS,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_CLOUDNINE,
+		.hiddenAbility = ABILITY_THICKFAT,
 		.noFlip = TRUE,
 	},
 
@@ -3604,7 +3604,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_LEVITATE,
 		.ability2 = ABILITY_NEUTRALIZINGGAS,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_NONE,
+		.hiddenAbility = ABILITY_STENCH,
 		.noFlip = TRUE,
 	},
 
@@ -3637,7 +3637,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_LEVITATE,
 		.ability2 = ABILITY_NEUTRALIZINGGAS,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_NONE,
+		.hiddenAbility = ABILITY_STENCH,
 		.noFlip = TRUE,
 	},
 
@@ -3964,7 +3964,7 @@ const struct BaseStats gBaseStats[] =
 		.growthRate = GROWTH_SLOW,
 		.eggGroup1 = EGG_GROUP_WATER_3,
 		.eggGroup2 = EGG_GROUP_WATER_3,
-		.ability1 = ABILITY_ILLUMINATE,
+		.ability1 = ABILITY_VICTORYSTAR,
 		.ability2 = ABILITY_NATURALCURE,
 		.safariZoneFleeRate = 0,
 		.hiddenAbility = ABILITY_ANALYTIC,
@@ -3997,7 +3997,7 @@ const struct BaseStats gBaseStats[] =
 		.growthRate = GROWTH_SLOW,
 		.eggGroup1 = EGG_GROUP_WATER_3,
 		.eggGroup2 = EGG_GROUP_WATER_3,
-		.ability1 = ABILITY_ILLUMINATE,
+		.ability1 = ABILITY_VICTORYSTAR,
 		.ability2 = ABILITY_NATURALCURE,
 		.safariZoneFleeRate = 0,
 		.hiddenAbility = ABILITY_ANALYTIC,
@@ -4097,9 +4097,9 @@ const struct BaseStats gBaseStats[] =
 		.eggGroup1 = EGG_GROUP_HUMAN_LIKE,
 		.eggGroup2 = EGG_GROUP_HUMAN_LIKE,
 		.ability1 = ABILITY_OBLIVIOUS,
-		.ability2 = ABILITY_FOREWARN,
+		.ability2 = ABILITY_DRYSKIN,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_DRYSKIN,
+		.hiddenAbility = ABILITY_ICESCALES,
 		.noFlip = TRUE,
 	},
 
@@ -4759,7 +4759,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_PRESSURE,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_SNOWCLOAK,
+		.hiddenAbility = ABILITY_COMPETITIVE,
 		.noFlip = TRUE,
 	},
 
@@ -4792,7 +4792,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_PRESSURE,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_STATIC,
+		.hiddenAbility = ABILITY_DEFIANT,
 		.noFlip = TRUE,
 	},
 
@@ -4825,7 +4825,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_PRESSURE,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_FLAMEBODY,
+		.hiddenAbility = ABILITY_BERSERK,
 		.noFlip = TRUE,
 	},
 
@@ -4990,7 +4990,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_SYNCHRONIZE,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_NONE,
+		.hiddenAbility = ABILITY_MAGICGUARD,
 		.noFlip = TRUE,
 	},
 
@@ -5089,7 +5089,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_OVERGROW,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_LEAFGUARD,
+		.hiddenAbility = ABILITY_GRASSYSURGE,
 		.noFlip = TRUE,
 	},
 
@@ -5188,7 +5188,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_BLAZE,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_FLASHFIRE,
+		.hiddenAbility = ABILITY_DROUGHT,
 		.noFlip = TRUE,
 	},
 
@@ -5317,10 +5317,10 @@ const struct BaseStats gBaseStats[] =
 		.growthRate = GROWTH_MEDIUM_FAST,
 		.eggGroup1 = EGG_GROUP_FIELD,
 		.eggGroup2 = EGG_GROUP_FIELD,
-		.ability1 = ABILITY_RUNAWAY,
+		.ability1 = ABILITY_FRISK,
 		.ability2 = ABILITY_KEENEYE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_FRISK,
+		.hiddenAbility = ABILITY_HUSTLE,
 		.noFlip = TRUE,
 	},
 
@@ -5350,10 +5350,10 @@ const struct BaseStats gBaseStats[] =
 		.growthRate = GROWTH_MEDIUM_FAST,
 		.eggGroup1 = EGG_GROUP_FIELD,
 		.eggGroup2 = EGG_GROUP_FIELD,
-		.ability1 = ABILITY_RUNAWAY,
+		.ability1 = ABILITY_FRISK,
 		.ability2 = ABILITY_KEENEYE,
 		.safariZoneFleeRate = 90,
-		.hiddenAbility = ABILITY_FRISK,
+		.hiddenAbility = ABILITY_HUSTLE,
 		.noFlip = TRUE,
 	},
 
@@ -5450,9 +5450,9 @@ const struct BaseStats gBaseStats[] =
 		.eggGroup1 = EGG_GROUP_BUG,
 		.eggGroup2 = EGG_GROUP_BUG,
 		.ability1 = ABILITY_SWARM,
-		.ability2 = ABILITY_EARLYBIRD,
+		.ability2 = ABILITY_RATTLED,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_RATTLED,
+		.hiddenAbility = ABILITY_HUGEPOWER,
 		.noFlip = TRUE,
 	},
 
@@ -5485,7 +5485,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_SWARM,
 		.ability2 = ABILITY_EARLYBIRD,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_IRONFIST,
+		.hiddenAbility = ABILITY_HUGEPOWER,
 		.noFlip = TRUE,
 	},
 
@@ -5515,10 +5515,10 @@ const struct BaseStats gBaseStats[] =
 		.growthRate = GROWTH_FAST,
 		.eggGroup1 = EGG_GROUP_BUG,
 		.eggGroup2 = EGG_GROUP_BUG,
-		.ability1 = ABILITY_SWARM,
+		.ability1 = ABILITY_SNIPER,
 		.ability2 = ABILITY_INSOMNIA,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_SNIPER,
+		.hiddenAbility = ABILITY_MERCILESS,
 		.noFlip = TRUE,
 	},
 
@@ -5548,10 +5548,10 @@ const struct BaseStats gBaseStats[] =
 		.growthRate = GROWTH_FAST,
 		.eggGroup1 = EGG_GROUP_BUG,
 		.eggGroup2 = EGG_GROUP_BUG,
-		.ability1 = ABILITY_SWARM,
+		.ability1 = ABILITY_SNIPER,
 		.ability2 = ABILITY_INSOMNIA,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_SNIPER,
+		.hiddenAbility = ABILITY_MERCILESS,
 		.noFlip = TRUE,
 	},
 
@@ -5615,9 +5615,9 @@ const struct BaseStats gBaseStats[] =
 		.eggGroup1 = EGG_GROUP_WATER_2,
 		.eggGroup2 = EGG_GROUP_WATER_2,
 		.ability1 = ABILITY_VOLTABSORB,
-		.ability2 = ABILITY_ILLUMINATE,
+		.ability2 = ABILITY_WATERABSORB,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_WATERABSORB,
+		.hiddenAbility = ABILITY_LIGHTNINGROD,
 		.noFlip = TRUE,
 	},
 
@@ -5648,9 +5648,9 @@ const struct BaseStats gBaseStats[] =
 		.eggGroup1 = EGG_GROUP_WATER_2,
 		.eggGroup2 = EGG_GROUP_WATER_2,
 		.ability1 = ABILITY_VOLTABSORB,
-		.ability2 = ABILITY_ILLUMINATE,
+		.ability2 = ABILITY_WATERABSORB,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_WATERABSORB,
+		.hiddenAbility = ABILITY_LIGHTNINGROD,
 		.noFlip = TRUE,
 	},
 
@@ -5681,7 +5681,7 @@ const struct BaseStats gBaseStats[] =
 		.eggGroup1 = EGG_GROUP_UNDISCOVERED,
 		.eggGroup2 = EGG_GROUP_UNDISCOVERED,
 		.ability1 = ABILITY_STATIC,
-		.ability2 = ABILITY_NONE,
+		.ability2 = ABILITY_STATIC,
 		.safariZoneFleeRate = 0,
 		.hiddenAbility = ABILITY_LIGHTNINGROD,
 		.noFlip = TRUE,
@@ -5914,7 +5914,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_STATIC,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_PLUS,
+		.hiddenAbility = ABILITY_LIGHTNINGROD,
 		.noFlip = TRUE,
 	},
 
@@ -5947,7 +5947,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_STATIC,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_PLUS,
+		.hiddenAbility = ABILITY_LIGHTNINGROD,
 		.noFlip = TRUE,
 	},
 
@@ -5980,7 +5980,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_STATIC,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_PLUS,
+		.hiddenAbility = ABILITY_LIGHTNINGROD,
 		.noFlip = TRUE,
 	},
 
@@ -6013,7 +6013,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_CHLOROPHYLL,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_HEALER,
+		.hiddenAbility = ABILITY_TRIAGE,
 		.noFlip = TRUE,
 	},
 
@@ -6112,7 +6112,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_STURDY,
 		.ability2 = ABILITY_ROCKHEAD,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_RATTLED,
+		.hiddenAbility = ABILITY_SAPSIPPER,
 		.noFlip = TRUE,
 	},
 
@@ -6176,9 +6176,9 @@ const struct BaseStats gBaseStats[] =
 		.eggGroup1 = EGG_GROUP_FAIRY,
 		.eggGroup2 = EGG_GROUP_GRASS,
 		.ability1 = ABILITY_CHLOROPHYLL,
-		.ability2 = ABILITY_LEAFGUARD,
+		.ability2 = ABILITY_INFILTRATOR,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_INFILTRATOR,
+		.hiddenAbility = ABILITY_LEAFGUARD,
 		.noFlip = TRUE,
 	},
 
@@ -6209,9 +6209,9 @@ const struct BaseStats gBaseStats[] =
 		.eggGroup1 = EGG_GROUP_FAIRY,
 		.eggGroup2 = EGG_GROUP_GRASS,
 		.ability1 = ABILITY_CHLOROPHYLL,
-		.ability2 = ABILITY_LEAFGUARD,
+		.ability2 = ABILITY_INFILTRATOR,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_INFILTRATOR,
+		.hiddenAbility = ABILITY_LEAFGUARD,
 		.noFlip = TRUE,
 	},
 
@@ -6242,9 +6242,9 @@ const struct BaseStats gBaseStats[] =
 		.eggGroup1 = EGG_GROUP_FAIRY,
 		.eggGroup2 = EGG_GROUP_GRASS,
 		.ability1 = ABILITY_CHLOROPHYLL,
-		.ability2 = ABILITY_LEAFGUARD,
+		.ability2 = ABILITY_INFILTRATOR,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_INFILTRATOR,
+		.hiddenAbility = ABILITY_COTTONDOWN,
 		.noFlip = TRUE,
 	},
 
@@ -6607,7 +6607,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_LEVITATE,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_NONE,
+		.hiddenAbility = ABILITY_MAGICIAN,
 		.noFlip = TRUE,
 	},
 
@@ -6640,7 +6640,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_LEVITATE,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_NONE,
+		.hiddenAbility = ABILITY_ADAPTABILITY,
 		.noFlip = TRUE,
 	},
 
@@ -6704,9 +6704,9 @@ const struct BaseStats gBaseStats[] =
 		.eggGroup1 = EGG_GROUP_FIELD,
 		.eggGroup2 = EGG_GROUP_FIELD,
 		.ability1 = ABILITY_INNERFOCUS,
-		.ability2 = ABILITY_EARLYBIRD,
+		.ability2 = ABILITY_SAPSIPPER,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_SAPSIPPER,
+		.hiddenAbility = ABILITY_SPEEDBOOST,
 		.noFlip = TRUE,
 	},
 
@@ -6904,7 +6904,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_INTIMIDATE,
 		.ability2 = ABILITY_RUNAWAY,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_RATTLED,
+		.hiddenAbility = ABILITY_STRONGJAW,
 		.noFlip = TRUE,
 	},
 
@@ -6937,7 +6937,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_INTIMIDATE,
 		.ability2 = ABILITY_QUICKFEET,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_RATTLED,
+		.hiddenAbility = ABILITY_STRONGJAW,
 		.noFlip = TRUE,
 	},
 
@@ -7088,9 +7088,9 @@ const struct BaseStats gBaseStats[] =
 		.evYield_HP 		= 0,
 		.evYield_Attack 	= 0,
 		.evYield_Defense 	= 0,
-		.evYield_SpAttack 	= 1,
+		.evYield_SpAttack 	= 0,
 		.evYield_SpDefense 	= 0,
-		.evYield_Speed 		= 2,
+		.evYield_Speed 		= 1,
 		.item1 = ITEM_GRIP_CLAW,
 		.item2 = ITEM_QUICK_CLAW,
 		.genderRatio = PERCENT_FEMALE(50),
@@ -7168,7 +7168,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_GUTS,
 		.ability2 = ABILITY_QUICKFEET,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_UNNERVE,
+		.hiddenAbility = ABILITY_TOUGHCLAWS,
 		.noFlip = TRUE,
 	},
 
@@ -7250,7 +7250,7 @@ const struct BaseStats gBaseStats[] =
 		.type2 = TYPE_GROUND,
 		.catchRate = 225,
 		.expYield = 78,
-		.evYield_HP 		= 1,
+		.evYield_HP 		= 0,
 		.evYield_Attack 	= 1,
 		.evYield_Defense 	= 0,
 		.evYield_SpAttack 	= 0,
@@ -7364,7 +7364,7 @@ const struct BaseStats gBaseStats[] =
 		.eggGroup1 = EGG_GROUP_WATER_1,
 		.eggGroup2 = EGG_GROUP_WATER_2,
 		.ability1 = ABILITY_HUSTLE,
-		.ability2 = ABILITY_SNIPER,
+		.ability2 = ABILITY_SKILLLINK,
 		.safariZoneFleeRate = 0,
 		.hiddenAbility = ABILITY_MOODY,
 		.noFlip = TRUE,
@@ -7397,7 +7397,7 @@ const struct BaseStats gBaseStats[] =
 		.eggGroup1 = EGG_GROUP_WATER_1,
 		.eggGroup2 = EGG_GROUP_WATER_2,
 		.ability1 = ABILITY_SUCTIONCUPS,
-		.ability2 = ABILITY_SNIPER,
+		.ability2 = ABILITY_SKILLLINK,
 		.safariZoneFleeRate = 0,
 		.hiddenAbility = ABILITY_MOODY,
 		.noFlip = TRUE,
@@ -7432,7 +7432,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_VITALSPIRIT,
 		.ability2 = ABILITY_HUSTLE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_INSOMNIA,
+		.hiddenAbility = ABILITY_PRANKSTER,
 		.noFlip = TRUE,
 	},
 
@@ -7528,7 +7528,7 @@ const struct BaseStats gBaseStats[] =
 		.growthRate = GROWTH_SLOW,
 		.eggGroup1 = EGG_GROUP_FIELD,
 		.eggGroup2 = EGG_GROUP_FIELD,
-		.ability1 = ABILITY_EARLYBIRD,
+		.ability1 = ABILITY_MOXIE,
 		.ability2 = ABILITY_FLASHFIRE,
 		.safariZoneFleeRate = 0,
 		.hiddenAbility = ABILITY_UNNERVE,
@@ -7561,7 +7561,7 @@ const struct BaseStats gBaseStats[] =
 		.growthRate = GROWTH_SLOW,
 		.eggGroup1 = EGG_GROUP_FIELD,
 		.eggGroup2 = EGG_GROUP_FIELD,
-		.ability1 = ABILITY_EARLYBIRD,
+		.ability1 = ABILITY_MOXIE,
 		.ability2 = ABILITY_FLASHFIRE,
 		.safariZoneFleeRate = 0,
 		.hiddenAbility = ABILITY_UNNERVE,
@@ -7727,9 +7727,9 @@ const struct BaseStats gBaseStats[] =
 		.eggGroup1 = EGG_GROUP_FIELD,
 		.eggGroup2 = EGG_GROUP_FIELD,
 		.ability1 = ABILITY_INTIMIDATE,
-		.ability2 = ABILITY_FRISK,
+		.ability2 = ABILITY_SAPSIPPER,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_SAPSIPPER,
+		.hiddenAbility = ABILITY_SCRAPPY,
 		.noFlip = TRUE,
 	},
 
@@ -7760,7 +7760,7 @@ const struct BaseStats gBaseStats[] =
 		.eggGroup1 = EGG_GROUP_FIELD,
 		.eggGroup2 = EGG_GROUP_FIELD,
 		.ability1 = ABILITY_OWNTEMPO,
-		.ability2 = ABILITY_TECHNICIAN,
+		.ability2 = ABILITY_TRACE,
 		.safariZoneFleeRate = 0,
 		.hiddenAbility = ABILITY_MOODY,
 		.noFlip = TRUE,
@@ -7859,9 +7859,9 @@ const struct BaseStats gBaseStats[] =
 		.eggGroup1 = EGG_GROUP_UNDISCOVERED,
 		.eggGroup2 = EGG_GROUP_UNDISCOVERED,
 		.ability1 = ABILITY_OBLIVIOUS,
-		.ability2 = ABILITY_FOREWARN,
+		.ability2 = ABILITY_HYDRATION,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_HYDRATION,
+		.hiddenAbility = ABILITY_ICESCALES,
 		.noFlip = TRUE,
 	},
 
@@ -8290,7 +8290,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_NATURALCURE,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_NONE,
+		.hiddenAbility = ABILITY_REGENERATOR,
 		.noFlip = TRUE,
 	},
 
@@ -8618,9 +8618,9 @@ const struct BaseStats gBaseStats[] =
 		.eggGroup1 = EGG_GROUP_FIELD,
 		.eggGroup2 = EGG_GROUP_FIELD,
 		.ability1 = ABILITY_RUNAWAY,
-		.ability2 = ABILITY_QUICKFEET,
+		.ability2 = ABILITY_STRONGJAW,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_RATTLED,
+		.hiddenAbility = ABILITY_QUICKFEET,
 		.noFlip = TRUE,
 	},
 
@@ -8651,7 +8651,7 @@ const struct BaseStats gBaseStats[] =
 		.eggGroup1 = EGG_GROUP_FIELD,
 		.eggGroup2 = EGG_GROUP_FIELD,
 		.ability1 = ABILITY_INTIMIDATE,
-		.ability2 = ABILITY_QUICKFEET,
+		.ability2 = ABILITY_STRONGJAW,
 		.safariZoneFleeRate = 0,
 		.hiddenAbility = ABILITY_MOXIE,
 		.noFlip = TRUE,
@@ -8752,7 +8752,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_SHIELDDUST,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_RUNAWAY,
+		.hiddenAbility = ABILITY_TECHNICIAN,
 		.noFlip = TRUE,
 	},
 
@@ -8818,7 +8818,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_SWARM,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_RIVALRY,
+		.hiddenAbility = ABILITY_COMPOUNDEYES,
 		.noFlip = TRUE,
 	},
 
@@ -8884,7 +8884,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_SHIELDDUST,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_COMPOUNDEYES,
+		.hiddenAbility = ABILITY_TINTEDLENS,
 		.noFlip = TRUE,
 	},
 
@@ -9344,7 +9344,7 @@ const struct BaseStats gBaseStats[] =
 		.eggGroup1 = EGG_GROUP_FIELD,
 		.eggGroup2 = EGG_GROUP_HUMAN_LIKE,
 		.ability1 = ABILITY_OWNTEMPO,
-		.ability2 = ABILITY_TANGLEDFEET,
+		.ability2 = ABILITY_HUGEPOWER,
 		.safariZoneFleeRate = 0,
 		.hiddenAbility = ABILITY_CONTRARY,
 		.noFlip = TRUE,
@@ -9443,7 +9443,7 @@ const struct BaseStats gBaseStats[] =
 		.eggGroup1 = EGG_GROUP_WATER_1,
 		.eggGroup2 = EGG_GROUP_BUG,
 		.ability1 = ABILITY_SWIFTSWIM,
-		.ability2 = ABILITY_NONE,
+		.ability2 = ABILITY_SWIFTSWIM,
 		.safariZoneFleeRate = 0,
 		.hiddenAbility = ABILITY_RAINDISH,
 		.noFlip = TRUE,
@@ -9476,7 +9476,7 @@ const struct BaseStats gBaseStats[] =
 		.eggGroup1 = EGG_GROUP_WATER_1,
 		.eggGroup2 = EGG_GROUP_BUG,
 		.ability1 = ABILITY_INTIMIDATE,
-		.ability2 = ABILITY_NONE,
+		.ability2 = ABILITY_COMPOUNDEYES,
 		.safariZoneFleeRate = 0,
 		.hiddenAbility = ABILITY_UNNERVE,
 		.noFlip = TRUE,
@@ -9511,7 +9511,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_WATERVEIL,
 		.ability2 = ABILITY_OBLIVIOUS,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_PRESSURE,
+		.hiddenAbility = ABILITY_REGENERATOR,
 		.noFlip = TRUE,
 	},
 
@@ -9544,7 +9544,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_WATERVEIL,
 		.ability2 = ABILITY_OBLIVIOUS,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_PRESSURE,
+		.hiddenAbility = ABILITY_REGENERATOR,
 		.noFlip = TRUE,
 	},
 
@@ -9676,7 +9676,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_LEVITATE,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_NONE,
+		.hiddenAbility = ABILITY_SHADOWSHIELD,
 		.noFlip = TRUE,
 	},
 
@@ -9709,7 +9709,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_LEVITATE,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_NONE,
+		.hiddenAbility = ABILITY_SHADOWSHIELD,
 		.noFlip = TRUE,
 	},
 
@@ -9905,9 +9905,9 @@ const struct BaseStats gBaseStats[] =
 		.eggGroup1 = EGG_GROUP_WATER_2,
 		.eggGroup2 = EGG_GROUP_WATER_2,
 		.ability1 = ABILITY_SWIFTSWIM,
-		.ability2 = ABILITY_NONE,
+		.ability2 = ABILITY_HYDRATION,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_HYDRATION,
+		.hiddenAbility = ABILITY_DRIZZLE,
 		.noFlip = TRUE,
 	},
 
@@ -10171,7 +10171,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_LEVITATE,
 		.ability2 = ABILITY_LEVITATE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_NONE,
+		.hiddenAbility = ABILITY_PUNKROCK,
 		.noFlip = TRUE,
 	},
 
@@ -10204,7 +10204,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_LEVITATE,
 		.ability2 = ABILITY_LEVITATE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_NONE,
+		.hiddenAbility = ABILITY_PUNKROCK,
 		.noFlip = TRUE,
 	},
 
@@ -10303,7 +10303,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_STATIC,
 		.ability2 = ABILITY_LIGHTNINGROD,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_MINUS,
+		.hiddenAbility = ABILITY_FLAREBOOST,
 		.noFlip = TRUE,
 	},
 
@@ -10336,7 +10336,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_STATIC,
 		.ability2 = ABILITY_LIGHTNINGROD,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_MINUS,
+		.hiddenAbility = ABILITY_FLAREBOOST,
 		.noFlip = TRUE,
 	},
 
@@ -10435,7 +10435,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_THICKFAT,
 		.ability2 = ABILITY_ICEBODY,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_OBLIVIOUS,
+		.hiddenAbility = ABILITY_ICESCALES,
 		.noFlip = TRUE,
 	},
 
@@ -10468,7 +10468,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_THICKFAT,
 		.ability2 = ABILITY_ICEBODY,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_OBLIVIOUS,
+		.hiddenAbility = ABILITY_ICESCALES,
 		.noFlip = TRUE,
 	},
 
@@ -10501,7 +10501,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_THICKFAT,
 		.ability2 = ABILITY_ICEBODY,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_OBLIVIOUS,
+		.hiddenAbility = ABILITY_REGENERATOR,
 		.noFlip = TRUE,
 	},
 
@@ -10532,9 +10532,9 @@ const struct BaseStats gBaseStats[] =
 		.eggGroup1 = EGG_GROUP_GRASS,
 		.eggGroup2 = EGG_GROUP_HUMAN_LIKE,
 		.ability1 = ABILITY_SANDVEIL,
-		.ability2 = ABILITY_NONE,
+		.ability2 = ABILITY_WATERABSORB,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_WATERABSORB,
+		.hiddenAbility = ABILITY_PRANKSTER,
 		.noFlip = TRUE,
 	},
 
@@ -10565,9 +10565,9 @@ const struct BaseStats gBaseStats[] =
 		.eggGroup1 = EGG_GROUP_GRASS,
 		.eggGroup2 = EGG_GROUP_HUMAN_LIKE,
 		.ability1 = ABILITY_SANDVEIL,
-		.ability2 = ABILITY_NONE,
+		.ability2 = ABILITY_WATERABSORB,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_WATERABSORB,
+		.hiddenAbility = ABILITY_PRANKSTER,
 		.noFlip = TRUE,
 	},
 
@@ -10723,7 +10723,7 @@ const struct BaseStats gBaseStats[] =
 		.evYield_Speed 		= 0,
 		.item1 = ITEM_NONE,
 		.item2 = ITEM_NONE,
-		.genderRatio = PERCENT_FEMALE(75),
+		.genderRatio = PERCENT_FEMALE(50),
 		.eggCycles = 10,
 		.friendship = 50,
 		.growthRate = GROWTH_FAST,
@@ -10765,7 +10765,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_THICKFAT,
 		.ability2 = ABILITY_OWNTEMPO,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_GLUTTONY,
+		.hiddenAbility = ABILITY_MAGICBOUNCE,
 		.noFlip = TRUE,
 	},
 
@@ -10798,7 +10798,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_THICKFAT,
 		.ability2 = ABILITY_OWNTEMPO,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_GLUTTONY,
+		.hiddenAbility = ABILITY_MAGICBOUNCE,
 		.noFlip = TRUE,
 	},
 
@@ -10829,9 +10829,9 @@ const struct BaseStats gBaseStats[] =
 		.eggGroup1 = EGG_GROUP_FAIRY,
 		.eggGroup2 = EGG_GROUP_FAIRY,
 		.ability1 = ABILITY_PLUS,
-		.ability2 = ABILITY_NONE,
+		.ability2 = ABILITY_LIGHTNINGROD,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_LIGHTNINGROD,
+		.hiddenAbility = ABILITY_ELECTRICSURGE,
 		.noFlip = TRUE,
 	},
 
@@ -10862,9 +10862,9 @@ const struct BaseStats gBaseStats[] =
 		.eggGroup1 = EGG_GROUP_FAIRY,
 		.eggGroup2 = EGG_GROUP_FAIRY,
 		.ability1 = ABILITY_MINUS,
-		.ability2 = ABILITY_NONE,
+		.ability2 = ABILITY_VOLTABSORB,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_VOLTABSORB,
+		.hiddenAbility = ABILITY_ELECTRICSURGE,
 		.noFlip = TRUE,
 	},
 
@@ -11290,7 +11290,7 @@ const struct BaseStats gBaseStats[] =
 		.growthRate = GROWTH_FLUCTUATING,
 		.eggGroup1 = EGG_GROUP_AMORPHOUS,
 		.eggGroup2 = EGG_GROUP_AMORPHOUS,
-		.ability1 = ABILITY_LIQUIDOOZE,
+		.ability1 = ABILITY_GOOEY,
 		.ability2 = ABILITY_STICKYHOLD,
 		.safariZoneFleeRate = 0,
 		.hiddenAbility = ABILITY_GLUTTONY,
@@ -11323,7 +11323,7 @@ const struct BaseStats gBaseStats[] =
 		.growthRate = GROWTH_FLUCTUATING,
 		.eggGroup1 = EGG_GROUP_AMORPHOUS,
 		.eggGroup2 = EGG_GROUP_AMORPHOUS,
-		.ability1 = ABILITY_LIQUIDOOZE,
+		.ability1 = ABILITY_GOOEY,
 		.ability2 = ABILITY_STICKYHOLD,
 		.safariZoneFleeRate = 0,
 		.hiddenAbility = ABILITY_GLUTTONY,
@@ -11357,7 +11357,7 @@ const struct BaseStats gBaseStats[] =
 		.eggGroup1 = EGG_GROUP_MONSTER,
 		.eggGroup2 = EGG_GROUP_GRASS,
 		.ability1 = ABILITY_CHLOROPHYLL,
-		.ability2 = ABILITY_SOLARPOWER,
+		.ability2 = ABILITY_RIPEN,
 		.safariZoneFleeRate = 0,
 		.hiddenAbility = ABILITY_HARVEST,
 		.noFlip = TRUE,
@@ -11390,7 +11390,7 @@ const struct BaseStats gBaseStats[] =
 		.eggGroup1 = EGG_GROUP_MONSTER,
 		.eggGroup2 = EGG_GROUP_FIELD,
 		.ability1 = ABILITY_SOUNDPROOF,
-		.ability2 = ABILITY_NONE,
+		.ability2 = ABILITY_PUNKROCK,
 		.safariZoneFleeRate = 0,
 		.hiddenAbility = ABILITY_RATTLED,
 		.noFlip = TRUE,
@@ -11423,7 +11423,7 @@ const struct BaseStats gBaseStats[] =
 		.eggGroup1 = EGG_GROUP_MONSTER,
 		.eggGroup2 = EGG_GROUP_FIELD,
 		.ability1 = ABILITY_SOUNDPROOF,
-		.ability2 = ABILITY_NONE,
+		.ability2 = ABILITY_PUNKROCK,
 		.safariZoneFleeRate = 0,
 		.hiddenAbility = ABILITY_SCRAPPY,
 		.noFlip = TRUE,
@@ -11456,7 +11456,7 @@ const struct BaseStats gBaseStats[] =
 		.eggGroup1 = EGG_GROUP_MONSTER,
 		.eggGroup2 = EGG_GROUP_FIELD,
 		.ability1 = ABILITY_SOUNDPROOF,
-		.ability2 = ABILITY_NONE,
+		.ability2 = ABILITY_PUNKROCK,
 		.safariZoneFleeRate = 0,
 		.hiddenAbility = ABILITY_SCRAPPY,
 		.noFlip = TRUE,
@@ -11687,9 +11687,9 @@ const struct BaseStats gBaseStats[] =
 		.eggGroup1 = EGG_GROUP_FIELD,
 		.eggGroup2 = EGG_GROUP_DRAGON,
 		.ability1 = ABILITY_SHEDSKIN,
-		.ability2 = ABILITY_NONE,
+		.ability2 = ABILITY_INFILTRATOR,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_INFILTRATOR,
+		.hiddenAbility = ABILITY_POISONTOUCH,
 		.noFlip = TRUE,
 	},
 
@@ -11720,9 +11720,9 @@ const struct BaseStats gBaseStats[] =
 		.eggGroup1 = EGG_GROUP_FIELD,
 		.eggGroup2 = EGG_GROUP_FIELD,
 		.ability1 = ABILITY_IMMUNITY,
-		.ability2 = ABILITY_NONE,
+		.ability2 = ABILITY_TOXICBOOST,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_TOXICBOOST,
+		.hiddenAbility = ABILITY_TOUGHCLAWS,
 		.noFlip = TRUE,
 	},
 
@@ -11984,7 +11984,7 @@ const struct BaseStats gBaseStats[] =
 		.eggGroup1 = EGG_GROUP_WATER_3,
 		.eggGroup2 = EGG_GROUP_WATER_3,
 		.ability1 = ABILITY_SUCTIONCUPS,
-		.ability2 = ABILITY_NONE,
+		.ability2 = ABILITY_SIMPLE,
 		.safariZoneFleeRate = 0,
 		.hiddenAbility = ABILITY_STORMDRAIN,
 		.noFlip = TRUE,
@@ -12017,7 +12017,7 @@ const struct BaseStats gBaseStats[] =
 		.eggGroup1 = EGG_GROUP_WATER_3,
 		.eggGroup2 = EGG_GROUP_WATER_3,
 		.ability1 = ABILITY_SUCTIONCUPS,
-		.ability2 = ABILITY_NONE,
+		.ability2 = ABILITY_SIMPLE,
 		.safariZoneFleeRate = 0,
 		.hiddenAbility = ABILITY_STORMDRAIN,
 		.noFlip = TRUE,
@@ -12050,7 +12050,7 @@ const struct BaseStats gBaseStats[] =
 		.eggGroup1 = EGG_GROUP_WATER_3,
 		.eggGroup2 = EGG_GROUP_WATER_3,
 		.ability1 = ABILITY_BATTLEARMOR,
-		.ability2 = ABILITY_NONE,
+		.ability2 = ABILITY_TOUGHCLAWS,
 		.safariZoneFleeRate = 0,
 		.hiddenAbility = ABILITY_SWIFTSWIM,
 		.noFlip = TRUE,
@@ -12083,7 +12083,7 @@ const struct BaseStats gBaseStats[] =
 		.eggGroup1 = EGG_GROUP_WATER_3,
 		.eggGroup2 = EGG_GROUP_WATER_3,
 		.ability1 = ABILITY_BATTLEARMOR,
-		.ability2 = ABILITY_NONE,
+		.ability2 = ABILITY_TOUGHCLAWS,
 		.safariZoneFleeRate = 0,
 		.hiddenAbility = ABILITY_SWIFTSWIM,
 		.noFlip = TRUE,
@@ -12448,7 +12448,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_CLEARBODY,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_ICEBODY,
+		.hiddenAbility = ABILITY_FILTER,
 		.noFlip = TRUE,
 	},
 
@@ -12481,7 +12481,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_CLEARBODY,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_LIGHTMETAL,
+		.hiddenAbility = ABILITY_FILTER,
 		.noFlip = TRUE,
 	},
 
@@ -12514,7 +12514,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_DRIZZLE,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_NONE,
+		.hiddenAbility = ABILITY_HYDRATION,
 		.noFlip = TRUE,
 	},
 
@@ -12547,7 +12547,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_DROUGHT,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_NONE,
+		.hiddenAbility = ABILITY_HEATPROOF,
 		.noFlip = TRUE,
 	},
 
@@ -12580,7 +12580,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_AIRLOCK,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_NONE,
+		.hiddenAbility = ABILITY_SHEDSKIN,
 		.noFlip = TRUE,
 	},
 
@@ -12613,7 +12613,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_LEVITATE,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_NONE,
+		.hiddenAbility = ABILITY_SERENEGRACE,
 		.noFlip = TRUE,
 	},
 
@@ -12646,7 +12646,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_LEVITATE,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_NONE,
+		.hiddenAbility = ABILITY_SERENEGRACE,
 		.noFlip = TRUE,
 	},
 
@@ -12679,7 +12679,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_SERENEGRACE,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_NONE,
+		.hiddenAbility = ABILITY_TRACE,
 		.noFlip = TRUE,
 	},
 
@@ -12712,7 +12712,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_PRESSURE,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_NONE,
+		.hiddenAbility = ABILITY_LIMBER,
 		.noFlip = TRUE,
 	},
 
@@ -12745,7 +12745,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_LEVITATE,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_NONE,
+		.hiddenAbility = ABILITY_PSYCHICSURGE,
 		.noFlip = TRUE,
 	},
 
@@ -14164,7 +14164,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_SHEDSKIN,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_RUNAWAY,
+		.hiddenAbility = ABILITY_TECHNICIAN,
 		.noFlip = TRUE,
 	},
 
@@ -14393,7 +14393,7 @@ const struct BaseStats gBaseStats[] =
 		.eggGroup1 = EGG_GROUP_MONSTER,
 		.eggGroup2 = EGG_GROUP_MONSTER,
 		.ability1 = ABILITY_MOLDBREAKER,
-		.ability2 = ABILITY_NONE,
+		.ability2 = ABILITY_RECKLESS,
 		.safariZoneFleeRate = 0,
 		.hiddenAbility = ABILITY_SHEERFORCE,
 		.noFlip = TRUE,
@@ -14426,7 +14426,7 @@ const struct BaseStats gBaseStats[] =
 		.eggGroup1 = EGG_GROUP_MONSTER,
 		.eggGroup2 = EGG_GROUP_MONSTER,
 		.ability1 = ABILITY_MOLDBREAKER,
-		.ability2 = ABILITY_NONE,
+		.ability2 = ABILITY_RECKLESS,
 		.safariZoneFleeRate = 0,
 		.hiddenAbility = ABILITY_SHEERFORCE,
 		.noFlip = TRUE,
@@ -14459,9 +14459,9 @@ const struct BaseStats gBaseStats[] =
 		.eggGroup1 = EGG_GROUP_MONSTER,
 		.eggGroup2 = EGG_GROUP_MONSTER,
 		.ability1 = ABILITY_STURDY,
-		.ability2 = ABILITY_NONE,
+		.ability2 = ABILITY_SOUNDPROOF,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_SOUNDPROOF,
+		.hiddenAbility = ABILITY_DAUNTLESSSHIELD,
 		.noFlip = TRUE,
 	},
 
@@ -14492,9 +14492,9 @@ const struct BaseStats gBaseStats[] =
 		.eggGroup1 = EGG_GROUP_MONSTER,
 		.eggGroup2 = EGG_GROUP_MONSTER,
 		.ability1 = ABILITY_STURDY,
-		.ability2 = ABILITY_NONE,
+		.ability2 = ABILITY_SOUNDPROOF,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_SOUNDPROOF,
+		.hiddenAbility = ABILITY_DAUNTLESSSHIELD,
 		.noFlip = TRUE,
 	},
 
@@ -14557,7 +14557,7 @@ const struct BaseStats gBaseStats[] =
 		.growthRate = GROWTH_MEDIUM_FAST,
 		.eggGroup1 = EGG_GROUP_BUG,
 		.eggGroup2 = EGG_GROUP_BUG,
-		.ability1 = ABILITY_ANTICIPATION,
+		.ability1 = ABILITY_TECHNICIAN,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
 		.hiddenAbility = ABILITY_OVERCOAT,
@@ -14590,10 +14590,10 @@ const struct BaseStats gBaseStats[] =
 		.growthRate = GROWTH_MEDIUM_FAST,
 		.eggGroup1 = EGG_GROUP_BUG,
 		.eggGroup2 = EGG_GROUP_BUG,
-		.ability1 = ABILITY_SWARM,
+		.ability1 = ABILITY_COMPOUNDEYES,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_TINTEDLENS,
+		.hiddenAbility = ABILITY_ADAPTABILITY,
 		.noFlip = TRUE,
 	},
 
@@ -14659,7 +14659,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_PRESSURE,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_UNNERVE,
+		.hiddenAbility = ABILITY_MULTISCALE,
 		.noFlip = TRUE,
 	},
 
@@ -14689,7 +14689,7 @@ const struct BaseStats gBaseStats[] =
 		.growthRate = GROWTH_MEDIUM_FAST,
 		.eggGroup1 = EGG_GROUP_FIELD,
 		.eggGroup2 = EGG_GROUP_FAIRY,
-		.ability1 = ABILITY_RUNAWAY,
+		.ability1 = ABILITY_SERENEGRACE,
 		.ability2 = ABILITY_PICKUP,
 		.safariZoneFleeRate = 0,
 		.hiddenAbility = ABILITY_VOLTABSORB,
@@ -14723,9 +14723,9 @@ const struct BaseStats gBaseStats[] =
 		.eggGroup1 = EGG_GROUP_WATER_1,
 		.eggGroup2 = EGG_GROUP_FIELD,
 		.ability1 = ABILITY_SWIFTSWIM,
-		.ability2 = ABILITY_NONE,
+		.ability2 = ABILITY_WATERVEIL,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_WATERVEIL,
+		.hiddenAbility = ABILITY_TECHNICIAN,
 		.noFlip = TRUE,
 	},
 
@@ -14756,9 +14756,9 @@ const struct BaseStats gBaseStats[] =
 		.eggGroup1 = EGG_GROUP_WATER_1,
 		.eggGroup2 = EGG_GROUP_FIELD,
 		.ability1 = ABILITY_SWIFTSWIM,
-		.ability2 = ABILITY_NONE,
+		.ability2 = ABILITY_WATERVEIL,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_WATERVEIL,
+		.hiddenAbility = ABILITY_TECHNICIAN,
 		.noFlip = TRUE,
 	},
 
@@ -15088,7 +15088,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_LEVITATE,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_NONE,
+		.hiddenAbility = ABILITY_MAGICBOUNCE,
 		.noFlip = TRUE,
 	},
 
@@ -15115,7 +15115,7 @@ const struct BaseStats gBaseStats[] =
 		.genderRatio = PERCENT_FEMALE(50),
 		.eggCycles = 20,
 		.friendship = 35,
-		.growthRate = GROWTH_MEDIUM_FAST,
+		.growthRate = GROWTH_MEDIUM_SLOW,
 		.eggGroup1 = EGG_GROUP_FLYING,
 		.eggGroup2 = EGG_GROUP_FLYING,
 		.ability1 = ABILITY_INSOMNIA,
@@ -15220,7 +15220,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_LEVITATE,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_NONE,
+		.hiddenAbility = ABILITY_FOREWARN,
 		.noFlip = TRUE,
 	},
 
@@ -15385,7 +15385,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_STURDY,
 		.ability2 = ABILITY_ROCKHEAD,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_RATTLED,
+		.hiddenAbility = ABILITY_SAPSIPPER,
 		.noFlip = TRUE,
 	},
 
@@ -15484,7 +15484,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_KEENEYE,
 		.ability2 = ABILITY_TANGLEDFEET,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_BIGPECKS,
+		.hiddenAbility = ABILITY_PUNKROCK,
 		.noFlip = TRUE,
 	},
 
@@ -15515,9 +15515,9 @@ const struct BaseStats gBaseStats[] =
 		.eggGroup1 = EGG_GROUP_AMORPHOUS,
 		.eggGroup2 = EGG_GROUP_AMORPHOUS,
 		.ability1 = ABILITY_PRESSURE,
-		.ability2 = ABILITY_NONE,
+		.ability2 = ABILITY_INFILTRATOR,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_INFILTRATOR,
+		.hiddenAbility = ABILITY_BADDREAMS,
 		.noFlip = TRUE,
 	},
 
@@ -15619,6 +15619,140 @@ const struct BaseStats gBaseStats[] =
 		.hiddenAbility = ABILITY_ROUGHSKIN,
 		.noFlip = TRUE,
 	},
+/*
+
+	[SPECIES_GIBLE_B] =
+	{
+		.baseHP 		= 58,
+		.baseAttack 	= 70,
+		.baseDefense 	= 45,
+		.baseSpAttack 	= 45,
+		.baseSpDefense 	= 45,
+		.baseSpeed 		= 42,
+		.type1 = TYPE_DRAGON,
+		.type2 = TYPE_FIRE,
+		.catchRate = 45,
+		.expYield = 67,
+		.evYield_HP 		= 0,
+		.evYield_Attack 	= 1,
+		.evYield_Defense 	= 0,
+		.evYield_SpAttack 	= 0,
+		.evYield_SpDefense 	= 0,
+		.evYield_Speed 		= 0,
+		.item1 = ITEM_NONE,
+		.item2 = ITEM_HABAN_BERRY,
+		.genderRatio = PERCENT_FEMALE(50),
+		.eggCycles = 40,
+		.friendship = 50,
+		.growthRate = GROWTH_MEDIUM_SLOW,
+		.eggGroup1 = EGG_GROUP_MONSTER,
+		.eggGroup2 = EGG_GROUP_DRAGON,
+		.ability1 = ABILITY_FLASHFIRE,
+		.ability2 = ABILITY_NONE,
+		.safariZoneFleeRate = 0,
+		.hiddenAbility = ABILITY_ROUGHSKIN,
+		.noFlip = TRUE,
+	},
+
+	[SPECIES_GABITE_B] =
+	{
+		.baseHP 		= 68,
+		.baseAttack 	= 90,
+		.baseDefense 	= 65,
+		.baseSpAttack 	= 50,
+		.baseSpDefense 	= 55,
+		.baseSpeed 		= 82,
+		.type1 = TYPE_DRAGON,
+		.type2 = TYPE_FIRE,
+		.catchRate = 45,
+		.expYield = 144,
+		.evYield_HP 		= 0,
+		.evYield_Attack 	= 2,
+		.evYield_Defense 	= 0,
+		.evYield_SpAttack 	= 0,
+		.evYield_SpDefense 	= 0,
+		.evYield_Speed 		= 0,
+		.item1 = ITEM_NONE,
+		.item2 = ITEM_HABAN_BERRY,
+		.genderRatio = PERCENT_FEMALE(50),
+		.eggCycles = 40,
+		.friendship = 50,
+		.growthRate = GROWTH_MEDIUM_SLOW,
+		.eggGroup1 = EGG_GROUP_MONSTER,
+		.eggGroup2 = EGG_GROUP_DRAGON,
+		.ability1 = ABILITY_FLASHFIRE,
+		.ability2 = ABILITY_NONE,
+		.safariZoneFleeRate = 0,
+		.hiddenAbility = ABILITY_ROUGHSKIN,
+		.noFlip = TRUE,
+	},
+
+	[SPECIES_GARCHOMP_B] =
+	{
+		.baseHP 		= 108,
+		.baseAttack 	= 130,
+		.baseDefense 	= 95,
+		.baseSpAttack 	= 80,
+		.baseSpDefense 	= 85,
+		.baseSpeed 		= 102,
+		.type1 = TYPE_DRAGON,
+		.type2 = TYPE_FIRE,
+		.catchRate = 45,
+		.expYield = 218,
+		.evYield_HP 		= 0,
+		.evYield_Attack 	= 3,
+		.evYield_Defense 	= 0,
+		.evYield_SpAttack 	= 0,
+		.evYield_SpDefense 	= 0,
+		.evYield_Speed 		= 0,
+		.item1 = ITEM_NONE,
+		.item2 = ITEM_HABAN_BERRY,
+		.genderRatio = PERCENT_FEMALE(50),
+		.eggCycles = 40,
+		.friendship = 50,
+		.growthRate = GROWTH_MEDIUM_SLOW,
+		.eggGroup1 = EGG_GROUP_MONSTER,
+		.eggGroup2 = EGG_GROUP_DRAGON,
+		.ability1 = ABILITY_FLASHFIRE,
+		.ability2 = ABILITY_NONE,
+		.safariZoneFleeRate = 0,
+		.hiddenAbility = ABILITY_ROUGHSKIN,
+		.noFlip = TRUE,
+	},
+
+	[SPECIES_GARCHOMP_B_MEGA] =
+	{
+		.baseHP 		= 108,
+		.baseAttack 	= 145,
+		.baseDefense 	= 115,
+		.baseSpAttack 	= 135,
+		.baseSpDefense 	= 95,
+		.baseSpeed 		= 102,
+		.type1 = TYPE_DRAGON,
+		.type2 = TYPE_FIRE,
+		.catchRate = 45,
+		.expYield = 218,
+		.evYield_HP 		= 0,
+		.evYield_Attack 	= 3,
+		.evYield_Defense 	= 0,
+		.evYield_SpAttack 	= 0,
+		.evYield_SpDefense 	= 0,
+		.evYield_Speed 		= 0,
+		.item1 = ITEM_NONE,
+		.item2 = ITEM_NONE,
+		.genderRatio = PERCENT_FEMALE(50),
+		.eggCycles = 40,
+		.friendship = 50,
+		.growthRate = GROWTH_MEDIUM_SLOW,
+		.eggGroup1 = EGG_GROUP_DRAGON,
+		.eggGroup2 = EGG_GROUP_MONSTER,
+		.ability1 = ABILITY_SOLARPOWER,
+		.ability2 = ABILITY_NONE,
+		.safariZoneFleeRate = 0,
+		.hiddenAbility = ABILITY_NONE,
+		.noFlip = TRUE,
+	},
+*/
 
 	[SPECIES_MUNCHLAX] =
 	{
@@ -15946,7 +16080,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_LEVITATE,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_NONE,
+		.hiddenAbility = ABILITY_GRASSYSURGE,
 		.noFlip = TRUE,
 	},
 
@@ -15979,7 +16113,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_SWIFTSWIM,
 		.ability2 = ABILITY_STORMDRAIN,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_WATERVEIL,
+		.hiddenAbility = ABILITY_WATERBUBBLE,
 		.noFlip = TRUE,
 	},
 
@@ -16012,7 +16146,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_SWIFTSWIM,
 		.ability2 = ABILITY_STORMDRAIN,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_WATERVEIL,
+		.hiddenAbility = ABILITY_WATERBUBBLE,
 		.noFlip = TRUE,
 	},
 
@@ -16210,7 +16344,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_OWNTEMPO,
 		.ability2 = ABILITY_OBLIVIOUS,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_CLOUDNINE,
+		.hiddenAbility = ABILITY_THICKFAT,
 		.noFlip = TRUE,
 	},
 
@@ -16342,7 +16476,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_FLAMEBODY,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_VITALSPIRIT,
+		.hiddenAbility = ABILITY_SHEERFORCE,
 		.noFlip = TRUE,
 	},
 
@@ -16438,8 +16572,8 @@ const struct BaseStats gBaseStats[] =
 		.growthRate = GROWTH_MEDIUM_FAST,
 		.eggGroup1 = EGG_GROUP_FIELD,
 		.eggGroup2 = EGG_GROUP_FIELD,
-		.ability1 = ABILITY_LEAFGUARD,
-		.ability2 = ABILITY_LEAFGUARD,
+		.ability1 = ABILITY_SAPSIPPER,
+		.ability2 = ABILITY_SAPSIPPER,
 		.safariZoneFleeRate = 0,
 		.hiddenAbility = ABILITY_CHLOROPHYLL,
 		.noFlip = TRUE,
@@ -16474,7 +16608,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_SNOWCLOAK,
 		.ability2 = ABILITY_SNOWCLOAK,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_ICEBODY,
+		.hiddenAbility = ABILITY_ICESCALES,
 		.noFlip = TRUE,
 	},
 
@@ -16604,7 +16738,7 @@ const struct BaseStats gBaseStats[] =
 		.eggGroup1 = EGG_GROUP_AMORPHOUS,
 		.eggGroup2 = EGG_GROUP_HUMAN_LIKE,
 		.ability1 = ABILITY_STEADFAST,
-		.ability2 = ABILITY_STEADFAST,
+		.ability2 = ABILITY_MOXIE,
 		.safariZoneFleeRate = 0,
 		.hiddenAbility = ABILITY_JUSTIFIED,
 		.noFlip = TRUE,
@@ -16639,7 +16773,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_STURDY,
 		.ability2 = ABILITY_MAGNETPULL,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_SANDFORCE,
+		.hiddenAbility = ABILITY_ANALYTIC,
 		.noFlip = TRUE,
 	},
 
@@ -16672,7 +16806,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_PRESSURE,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_FRISK,
+		.hiddenAbility = ABILITY_IRONFIST,
 		.noFlip = TRUE,
 	},
 
@@ -16703,9 +16837,9 @@ const struct BaseStats gBaseStats[] =
 		.eggGroup1 = EGG_GROUP_FAIRY,
 		.eggGroup2 = EGG_GROUP_MINERAL,
 		.ability1 = ABILITY_SNOWCLOAK,
-		.ability2 = ABILITY_NONE,
+		.ability2 = ABILITY_CURSEDBODY,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_CURSEDBODY,
+		.hiddenAbility = ABILITY_PERISH_BODY,
 		.noFlip = TRUE,
 	},
 
@@ -16771,7 +16905,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_LEVITATE,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_NONE,
+		.hiddenAbility = ABILITY_COMATOSE,
 		.noFlip = TRUE,
 	},
 
@@ -16804,7 +16938,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_LEVITATE,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_NONE,
+		.hiddenAbility = ABILITY_MAGICBOUNCE,
 		.noFlip = TRUE,
 	},
 
@@ -16837,7 +16971,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_LEVITATE,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_NONE,
+		.hiddenAbility = ABILITY_INFILTRATOR,
 		.noFlip = TRUE,
 	},
 
@@ -17035,7 +17169,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_LEVITATE,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_NONE,
+		.hiddenAbility = ABILITY_MAGICIAN,
 		.noFlip = TRUE,
 	},
 
@@ -17068,7 +17202,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_HYDRATION,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_NONE,
+		.hiddenAbility = ABILITY_DRIZZLE,
 		.noFlip = TRUE,
 	},
 
@@ -17101,7 +17235,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_HYDRATION,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_NONE,
+		.hiddenAbility = ABILITY_SOULHEART,
 		.noFlip = TRUE,
 	},
 
@@ -17134,7 +17268,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_BADDREAMS,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_NONE,
+		.hiddenAbility = ABILITY_INFILTRATOR,
 		.noFlip = TRUE,
 	},
 
@@ -17167,7 +17301,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_NATURALCURE,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_NONE,
+		.hiddenAbility = ABILITY_FLOWERVEIL,
 		.noFlip = TRUE,
 	},
 
@@ -17233,7 +17367,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_VICTORYSTAR,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_NONE,
+		.hiddenAbility = ABILITY_SYNCHRONIZE,
 		.noFlip = TRUE,
 	},
 
@@ -17560,7 +17694,7 @@ const struct BaseStats gBaseStats[] =
 		.growthRate = GROWTH_MEDIUM_FAST,
 		.eggGroup1 = EGG_GROUP_FIELD,
 		.eggGroup2 = EGG_GROUP_FIELD,
-		.ability1 = ABILITY_RUNAWAY,
+		.ability1 = ABILITY_STAKEOUT,
 		.ability2 = ABILITY_KEENEYE,
 		.safariZoneFleeRate = 0,
 		.hiddenAbility = ABILITY_ANALYTIC,
@@ -17593,7 +17727,7 @@ const struct BaseStats gBaseStats[] =
 		.growthRate = GROWTH_MEDIUM_FAST,
 		.eggGroup1 = EGG_GROUP_FIELD,
 		.eggGroup2 = EGG_GROUP_FIELD,
-		.ability1 = ABILITY_ILLUMINATE,
+		.ability1 = ABILITY_STAKEOUT,
 		.ability2 = ABILITY_KEENEYE,
 		.safariZoneFleeRate = 0,
 		.hiddenAbility = ABILITY_ANALYTIC,
@@ -17784,7 +17918,7 @@ const struct BaseStats gBaseStats[] =
 		.evYield_SpDefense 	= 0,
 		.evYield_Speed 		= 1,
 		.item1 = ITEM_ORAN_BERRY,
-		.item2 = ITEM_OCCA_BERRY,
+		.item2 = ITEM_LEAF_STONE,
 		.genderRatio = PERCENT_FEMALE(12.5),
 		.eggCycles = 20,
 		.friendship = 50,
@@ -17794,7 +17928,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_GLUTTONY,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_OVERGROW,
+		.hiddenAbility = ABILITY_ADAPTABILITY,
 		.noFlip = TRUE,
 	},
 
@@ -17817,7 +17951,7 @@ const struct BaseStats gBaseStats[] =
 		.evYield_SpDefense 	= 0,
 		.evYield_Speed 		= 2,
 		.item1 = ITEM_ORAN_BERRY,
-		.item2 = ITEM_OCCA_BERRY,
+		.item2 = ITEM_LEAF_STONE,
 		.genderRatio = PERCENT_FEMALE(12.5),
 		.eggCycles = 20,
 		.friendship = 50,
@@ -17827,7 +17961,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_GLUTTONY,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_OVERGROW,
+		.hiddenAbility = ABILITY_ADAPTABILITY,
 		.noFlip = TRUE,
 	},
 
@@ -17850,7 +17984,7 @@ const struct BaseStats gBaseStats[] =
 		.evYield_SpDefense 	= 0,
 		.evYield_Speed 		= 1,
 		.item1 = ITEM_ORAN_BERRY,
-		.item2 = ITEM_PASSHO_BERRY,
+		.item2 = ITEM_FIRE_STONE,
 		.genderRatio = PERCENT_FEMALE(12.5),
 		.eggCycles = 20,
 		.friendship = 50,
@@ -17860,7 +17994,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_GLUTTONY,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_BLAZE,
+		.hiddenAbility = ABILITY_ADAPTABILITY,
 		.noFlip = TRUE,
 	},
 
@@ -17883,7 +18017,7 @@ const struct BaseStats gBaseStats[] =
 		.evYield_SpDefense 	= 0,
 		.evYield_Speed 		= 2,
 		.item1 = ITEM_ORAN_BERRY,
-		.item2 = ITEM_PASSHO_BERRY,
+		.item2 = ITEM_FIRE_STONE,
 		.genderRatio = PERCENT_FEMALE(12.5),
 		.eggCycles = 20,
 		.friendship = 50,
@@ -17893,7 +18027,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_GLUTTONY,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_BLAZE,
+		.hiddenAbility = ABILITY_ADAPTABILITY,
 		.noFlip = TRUE,
 	},
 
@@ -17916,7 +18050,7 @@ const struct BaseStats gBaseStats[] =
 		.evYield_SpDefense 	= 0,
 		.evYield_Speed 		= 1,
 		.item1 = ITEM_ORAN_BERRY,
-		.item2 = ITEM_RINDO_BERRY,
+		.item2 = ITEM_WATER_STONE,
 		.genderRatio = PERCENT_FEMALE(12.5),
 		.eggCycles = 20,
 		.friendship = 50,
@@ -17926,7 +18060,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_GLUTTONY,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_TORRENT,
+		.hiddenAbility = ABILITY_ADAPTABILITY,
 		.noFlip = TRUE,
 	},
 
@@ -17949,7 +18083,7 @@ const struct BaseStats gBaseStats[] =
 		.evYield_SpDefense 	= 0,
 		.evYield_Speed 		= 2,
 		.item1 = ITEM_ORAN_BERRY,
-		.item2 = ITEM_RINDO_BERRY,
+		.item2 = ITEM_WATER_STONE,
 		.genderRatio = PERCENT_FEMALE(12.5),
 		.eggCycles = 20,
 		.friendship = 50,
@@ -17959,7 +18093,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_GLUTTONY,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_TORRENT,
+		.hiddenAbility = ABILITY_ADAPTABILITY,
 		.noFlip = TRUE,
 	},
 
@@ -18022,7 +18156,7 @@ const struct BaseStats gBaseStats[] =
 		.growthRate = GROWTH_FAST,
 		.eggGroup1 = EGG_GROUP_FIELD,
 		.eggGroup2 = EGG_GROUP_FIELD,
-		.ability1 = ABILITY_FOREWARN,
+		.ability1 = ABILITY_MAGICGUARD,
 		.ability2 = ABILITY_SYNCHRONIZE,
 		.safariZoneFleeRate = 0,
 		.hiddenAbility = ABILITY_TELEPATHY,
@@ -18154,7 +18288,7 @@ const struct BaseStats gBaseStats[] =
 		.growthRate = GROWTH_MEDIUM_FAST,
 		.eggGroup1 = EGG_GROUP_FIELD,
 		.eggGroup2 = EGG_GROUP_FIELD,
-		.ability1 = ABILITY_LIGHTNINGROD,
+		.ability1 = ABILITY_MOXIE,
 		.ability2 = ABILITY_MOTORDRIVE,
 		.safariZoneFleeRate = 0,
 		.hiddenAbility = ABILITY_SAPSIPPER,
@@ -18187,7 +18321,7 @@ const struct BaseStats gBaseStats[] =
 		.growthRate = GROWTH_MEDIUM_FAST,
 		.eggGroup1 = EGG_GROUP_FIELD,
 		.eggGroup2 = EGG_GROUP_FIELD,
-		.ability1 = ABILITY_LIGHTNINGROD,
+		.ability1 = ABILITY_MOXIE,
 		.ability2 = ABILITY_MOTORDRIVE,
 		.safariZoneFleeRate = 0,
 		.hiddenAbility = ABILITY_SAPSIPPER,
@@ -18239,7 +18373,7 @@ const struct BaseStats gBaseStats[] =
 		.type2 = TYPE_ROCK,
 		.catchRate = 120,
 		.expYield = 134,
-		.evYield_HP 		= 1,
+		.evYield_HP 		= 0,
 		.evYield_Attack 	= 1,
 		.evYield_Defense 	= 1,
 		.evYield_SpAttack 	= 0,
@@ -18949,7 +19083,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_PRANKSTER,
 		.ability2 = ABILITY_INFILTRATOR,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_CHLOROPHYLL,
+		.hiddenAbility = ABILITY_COTTONDOWN,
 		.noFlip = TRUE,
 	},
 
@@ -18982,7 +19116,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_PRANKSTER,
 		.ability2 = ABILITY_INFILTRATOR,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_CHLOROPHYLL,
+		.hiddenAbility = ABILITY_COTTONDOWN,
 		.noFlip = TRUE,
 	},
 
@@ -19015,7 +19149,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_CHLOROPHYLL,
 		.ability2 = ABILITY_OWNTEMPO,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_LEAFGUARD,
+		.hiddenAbility = ABILITY_DANCER,
 		.noFlip = TRUE,
 	},
 
@@ -19048,7 +19182,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_CHLOROPHYLL,
 		.ability2 = ABILITY_OWNTEMPO,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_LEAFGUARD,
+		.hiddenAbility = ABILITY_DANCER,
 		.noFlip = TRUE,
 	},
 
@@ -19078,10 +19212,10 @@ const struct BaseStats gBaseStats[] =
 		.growthRate = GROWTH_MEDIUM_FAST,
 		.eggGroup1 = EGG_GROUP_WATER_2,
 		.eggGroup2 = EGG_GROUP_WATER_2,
-		.ability1 = ABILITY_RECKLESS,
+		.ability1 = ABILITY_MOLDBREAKER,
 		.ability2 = ABILITY_ADAPTABILITY,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_MOLDBREAKER,
+		.hiddenAbility = ABILITY_SPEEDBOOST,
 		.noFlip = TRUE,
 	},
 
@@ -20069,9 +20203,9 @@ const struct BaseStats gBaseStats[] =
 		.eggGroup1 = EGG_GROUP_WATER_1,
 		.eggGroup2 = EGG_GROUP_FLYING,
 		.ability1 = ABILITY_KEENEYE,
-		.ability2 = ABILITY_BIGPECKS,
+		.ability2 = ABILITY_HYDRATION,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_HYDRATION,
+		.hiddenAbility = ABILITY_COMPETITIVE,
 		.noFlip = TRUE,
 	},
 
@@ -20102,9 +20236,9 @@ const struct BaseStats gBaseStats[] =
 		.eggGroup1 = EGG_GROUP_FLYING,
 		.eggGroup2 = EGG_GROUP_WATER_1,
 		.ability1 = ABILITY_KEENEYE,
-		.ability2 = ABILITY_BIGPECKS,
+		.ability2 = ABILITY_HYDRATION,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_HYDRATION,
+		.hiddenAbility = ABILITY_COMPETITIVE,
 		.noFlip = TRUE,
 	},
 
@@ -20300,9 +20434,9 @@ const struct BaseStats gBaseStats[] =
 		.eggGroup1 = EGG_GROUP_FIELD,
 		.eggGroup2 = EGG_GROUP_FIELD,
 		.ability1 = ABILITY_STATIC,
-		.ability2 = ABILITY_NONE,
+		.ability2 = ABILITY_MOTORDRIVE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_MOTORDRIVE,
+		.hiddenAbility = ABILITY_ELECTRICSURGE,
 		.noFlip = TRUE,
 	},
 
@@ -20500,7 +20634,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_WATERABSORB,
 		.ability2 = ABILITY_CURSEDBODY,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_DAMP,
+		.hiddenAbility = ABILITY_PERISH_BODY,
 		.noFlip = TRUE,
 	},
 
@@ -20695,10 +20829,10 @@ const struct BaseStats gBaseStats[] =
 		.growthRate = GROWTH_MEDIUM_SLOW,
 		.eggGroup1 = EGG_GROUP_MINERAL,
 		.eggGroup2 = EGG_GROUP_MINERAL,
-		.ability1 = ABILITY_PLUS,
-		.ability2 = ABILITY_MINUS,
+		.ability1 = ABILITY_CLEARBODY,
+		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_CLEARBODY,
+		.hiddenAbility = ABILITY_MOTORDRIVE,
 		.noFlip = TRUE,
 	},
 
@@ -20728,10 +20862,10 @@ const struct BaseStats gBaseStats[] =
 		.growthRate = GROWTH_MEDIUM_SLOW,
 		.eggGroup1 = EGG_GROUP_MINERAL,
 		.eggGroup2 = EGG_GROUP_MINERAL,
-		.ability1 = ABILITY_PLUS,
-		.ability2 = ABILITY_MINUS,
+		.ability1 = ABILITY_CLEARBODY,
+		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_CLEARBODY,
+		.hiddenAbility = ABILITY_MOTORDRIVE,
 		.noFlip = TRUE,
 	},
 
@@ -20761,10 +20895,10 @@ const struct BaseStats gBaseStats[] =
 		.growthRate = GROWTH_MEDIUM_SLOW,
 		.eggGroup1 = EGG_GROUP_MINERAL,
 		.eggGroup2 = EGG_GROUP_MINERAL,
-		.ability1 = ABILITY_PLUS,
-		.ability2 = ABILITY_MINUS,
+		.ability1 = ABILITY_CLEARBODY,
+		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_CLEARBODY,
+		.hiddenAbility = ABILITY_MOTORDRIVE,
 		.noFlip = TRUE,
 	},
 
@@ -21143,7 +21277,7 @@ const struct BaseStats gBaseStats[] =
 		.type2 = TYPE_ICE,
 		.catchRate = 120,
 		.expYield = 61,
-		.evYield_HP 		= 1,
+		.evYield_HP 		= 0,
 		.evYield_Attack 	= 1,
 		.evYield_Defense 	= 0,
 		.evYield_SpAttack 	= 0,
@@ -21226,7 +21360,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_LEVITATE,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_NONE,
+		.hiddenAbility = ABILITY_FILTER,
 		.noFlip = TRUE,
 	},
 
@@ -21323,7 +21457,7 @@ const struct BaseStats gBaseStats[] =
 		.eggGroup1 = EGG_GROUP_WATER_1,
 		.eggGroup2 = EGG_GROUP_AMORPHOUS,
 		.ability1 = ABILITY_STATIC,
-		.ability2 = ABILITY_LIMBER,
+		.ability2 = ABILITY_WATERABSORB,
 		.safariZoneFleeRate = 0,
 		.hiddenAbility = ABILITY_SANDVEIL,
 		.noFlip = TRUE,
@@ -21455,7 +21589,7 @@ const struct BaseStats gBaseStats[] =
 		.eggGroup1 = EGG_GROUP_MINERAL,
 		.eggGroup2 = EGG_GROUP_MINERAL,
 		.ability1 = ABILITY_IRONFIST,
-		.ability2 = ABILITY_KLUTZ,
+		.ability2 = ABILITY_POWERSPOT,
 		.safariZoneFleeRate = 0,
 		.hiddenAbility = ABILITY_NOGUARD,
 		.noFlip = TRUE,
@@ -21488,7 +21622,7 @@ const struct BaseStats gBaseStats[] =
 		.eggGroup1 = EGG_GROUP_MINERAL,
 		.eggGroup2 = EGG_GROUP_MINERAL,
 		.ability1 = ABILITY_IRONFIST,
-		.ability2 = ABILITY_KLUTZ,
+		.ability2 = ABILITY_POWERSPOT,
 		.safariZoneFleeRate = 0,
 		.hiddenAbility = ABILITY_NOGUARD,
 		.noFlip = TRUE,
@@ -21589,7 +21723,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_RECKLESS,
 		.ability2 = ABILITY_SAPSIPPER,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_SOUNDPROOF,
+		.hiddenAbility = ABILITY_STAMINA,
 		.noFlip = TRUE,
 	},
 
@@ -21754,7 +21888,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_GLUTTONY,
 		.ability2 = ABILITY_FLASHFIRE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_WHITESMOKE,
+		.hiddenAbility = ABILITY_BERSERK,
 		.noFlip = TRUE,
 	},
 
@@ -21985,7 +22119,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_JUSTIFIED,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_NONE,
+		.hiddenAbility = ABILITY_NOGUARD,
 		.noFlip = TRUE,
 	},
 
@@ -22018,7 +22152,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_JUSTIFIED,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_NONE,
+		.hiddenAbility = ABILITY_STEADFAST,
 		.noFlip = TRUE,
 	},
 
@@ -22051,7 +22185,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_JUSTIFIED,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_NONE,
+		.hiddenAbility = ABILITY_NOGUARD,
 		.noFlip = TRUE,
 	},
 
@@ -22150,7 +22284,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_TURBOBLAZE,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_NONE,
+		.hiddenAbility = ABILITY_FLASHFIRE,
 		.noFlip = TRUE,
 	},
 
@@ -22183,7 +22317,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_TERAVOLT,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_NONE,
+		.hiddenAbility = ABILITY_LIGHTNINGROD,
 		.noFlip = TRUE,
 	},
 
@@ -22197,7 +22331,7 @@ const struct BaseStats gBaseStats[] =
 		.baseSpeed 		= 101,
 		.type1 = TYPE_GROUND,
 		.type2 = TYPE_FLYING,
-		.catchRate = 3,
+		.catchRate = 6,
 		.expYield = 255,
 		.evYield_HP 		= 0,
 		.evYield_Attack 	= 0,
@@ -22249,7 +22383,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_PRESSURE,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_NONE,
+		.hiddenAbility = ABILITY_REFRIGERATE,
 		.noFlip = TRUE,
 	},
 
@@ -22282,7 +22416,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_JUSTIFIED,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_NONE,
+		.hiddenAbility = ABILITY_INTREPIDSWORD,
 		.noFlip = TRUE,
 	},
 
@@ -22315,7 +22449,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_SERENEGRACE,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_NONE,
+		.hiddenAbility = ABILITY_COMPETITIVE,
 		.noFlip = TRUE,
 	},
 
@@ -22348,7 +22482,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_DOWNLOAD,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_NONE,
+		.hiddenAbility = ABILITY_ANALYTIC,
 		.noFlip = TRUE,
 	},
 
@@ -22543,7 +22677,7 @@ const struct BaseStats gBaseStats[] =
 		.growthRate = GROWTH_MEDIUM_FAST,
 		.eggGroup1 = EGG_GROUP_BUG,
 		.eggGroup2 = EGG_GROUP_BUG,
-		.ability1 = ABILITY_ANTICIPATION,
+		.ability1 = ABILITY_TECHNICIAN,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
 		.hiddenAbility = ABILITY_OVERCOAT,
@@ -22576,7 +22710,7 @@ const struct BaseStats gBaseStats[] =
 		.growthRate = GROWTH_MEDIUM_FAST,
 		.eggGroup1 = EGG_GROUP_BUG,
 		.eggGroup2 = EGG_GROUP_BUG,
-		.ability1 = ABILITY_ANTICIPATION,
+		.ability1 = ABILITY_TECHNICIAN,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
 		.hiddenAbility = ABILITY_OVERCOAT,
@@ -22604,7 +22738,7 @@ const struct BaseStats gBaseStats[] =
 		.item1 = ITEM_NONE,
 		.item2 = ITEM_NONE,
 		.genderRatio = PERCENT_FEMALE(50),
-		.eggCycles = 255,
+		.eggCycles = 20,
 		.friendship = 0,
 		.growthRate = GROWTH_MEDIUM_FAST,
 		.eggGroup1 = EGG_GROUP_WATER_1,
@@ -22876,7 +23010,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_SERENEGRACE,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_NONE,
+		.hiddenAbility = ABILITY_FLOWERVEIL,
 		.noFlip = TRUE,
 	},
 
@@ -23434,10 +23568,10 @@ const struct BaseStats gBaseStats[] =
 		.growthRate = GROWTH_MEDIUM_FAST,
 		.eggGroup1 = EGG_GROUP_WATER_2,
 		.eggGroup2 = EGG_GROUP_WATER_2,
-		.ability1 = ABILITY_ROCKHEAD,
+		.ability1 = ABILITY_MOLDBREAKER,
 		.ability2 = ABILITY_ADAPTABILITY,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_MOLDBREAKER,
+		.hiddenAbility = ABILITY_SPEEDBOOST,
 		.noFlip = TRUE,
 	},
 
@@ -23767,7 +23901,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_SERENEGRACE,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_NONE,
+		.hiddenAbility = ABILITY_DEFIANT,
 		.noFlip = TRUE,
 	},
 
@@ -23800,7 +23934,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_DOWNLOAD,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_NONE,
+		.hiddenAbility = ABILITY_ANALYTIC,
 		.noFlip = TRUE,
 	},
 
@@ -23833,7 +23967,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_DOWNLOAD,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_NONE,
+		.hiddenAbility = ABILITY_ANALYTIC,
 		.noFlip = TRUE,
 	},
 
@@ -23866,7 +24000,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_DOWNLOAD,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_NONE,
+		.hiddenAbility = ABILITY_ANALYTIC,
 		.noFlip = TRUE,
 	},
 
@@ -23899,7 +24033,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_DOWNLOAD,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_NONE,
+		.hiddenAbility = ABILITY_ANALYTIC,
 		.noFlip = TRUE,
 	},
 
@@ -24078,7 +24212,7 @@ const struct BaseStats gBaseStats[] =
 		.baseSpeed 		= 91,
 		.type1 = TYPE_GROUND,
 		.type2 = TYPE_FLYING,
-		.catchRate = 3,
+		.catchRate = 6,
 		.expYield = 255,
 		.evYield_HP 		= 0,
 		.evYield_Attack 	= 3,
@@ -24130,7 +24264,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_JUSTIFIED,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_NONE,
+		.hiddenAbility = ABILITY_INTREPIDSWORD,
 		.noFlip = TRUE,
 	},
 
@@ -24328,7 +24462,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_BLAZE,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_MAGICIAN,
+		.hiddenAbility = ABILITY_MAGICGUARD,
 		.noFlip = TRUE,
 	},
 
@@ -24451,7 +24585,7 @@ const struct BaseStats gBaseStats[] =
 		.evYield_Speed 		= 1,
 		.item1 = ITEM_NONE,
 		.item2 = ITEM_NONE,
-		.genderRatio = PERCENT_FEMALE(12.5),
+		.genderRatio = PERCENT_FEMALE(50),
 		.eggCycles = 15,
 		.friendship = 50,
 		.growthRate = GROWTH_MEDIUM_FAST,
@@ -24721,10 +24855,10 @@ const struct BaseStats gBaseStats[] =
 		.growthRate = GROWTH_MEDIUM_SLOW,
 		.eggGroup1 = EGG_GROUP_FIELD,
 		.eggGroup2 = EGG_GROUP_FIELD,
-		.ability1 = ABILITY_RIVALRY,
+		.ability1 = ABILITY_SOLARPOWER,
 		.ability2 = ABILITY_UNNERVE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_MOXIE,
+		.hiddenAbility = ABILITY_ADAPTABILITY,
 		.noFlip = TRUE,
 	},
 
@@ -24754,10 +24888,10 @@ const struct BaseStats gBaseStats[] =
 		.growthRate = GROWTH_MEDIUM_SLOW,
 		.eggGroup1 = EGG_GROUP_FIELD,
 		.eggGroup2 = EGG_GROUP_FIELD,
-		.ability1 = ABILITY_RIVALRY,
+		.ability1 = ABILITY_SOLARPOWER,
 		.ability2 = ABILITY_UNNERVE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_MOXIE,
+		.hiddenAbility = ABILITY_ADAPTABILITY,
 		.noFlip = TRUE,
 	},
 
@@ -24788,7 +24922,7 @@ const struct BaseStats gBaseStats[] =
 		.eggGroup1 = EGG_GROUP_FAIRY,
 		.eggGroup2 = EGG_GROUP_FAIRY,
 		.ability1 = ABILITY_FLOWERVEIL,
-		.ability2 = ABILITY_NONE,
+		.ability2 = ABILITY_AROMAVEIL,
 		.safariZoneFleeRate = 0,
 		.hiddenAbility = ABILITY_SYMBIOSIS,
 		.noFlip = TRUE,
@@ -24821,7 +24955,7 @@ const struct BaseStats gBaseStats[] =
 		.eggGroup1 = EGG_GROUP_FAIRY,
 		.eggGroup2 = EGG_GROUP_FAIRY,
 		.ability1 = ABILITY_FLOWERVEIL,
-		.ability2 = ABILITY_NONE,
+		.ability2 = ABILITY_AROMAVEIL,
 		.safariZoneFleeRate = 0,
 		.hiddenAbility = ABILITY_SYMBIOSIS,
 		.noFlip = TRUE,
@@ -24854,7 +24988,7 @@ const struct BaseStats gBaseStats[] =
 		.eggGroup1 = EGG_GROUP_FAIRY,
 		.eggGroup2 = EGG_GROUP_FAIRY,
 		.ability1 = ABILITY_FLOWERVEIL,
-		.ability2 = ABILITY_NONE,
+		.ability2 = ABILITY_AROMAVEIL,
 		.safariZoneFleeRate = 0,
 		.hiddenAbility = ABILITY_SYMBIOSIS,
 		.noFlip = TRUE,
@@ -24887,9 +25021,9 @@ const struct BaseStats gBaseStats[] =
 		.eggGroup1 = EGG_GROUP_FIELD,
 		.eggGroup2 = EGG_GROUP_FIELD,
 		.ability1 = ABILITY_SAPSIPPER,
-		.ability2 = ABILITY_NONE,
+		.ability2 = ABILITY_GRASSPELT,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_GRASSPELT,
+		.hiddenAbility = ABILITY_RUNAWAY,
 		.noFlip = TRUE,
 	},
 
@@ -24920,9 +25054,9 @@ const struct BaseStats gBaseStats[] =
 		.eggGroup1 = EGG_GROUP_FIELD,
 		.eggGroup2 = EGG_GROUP_FIELD,
 		.ability1 = ABILITY_SAPSIPPER,
-		.ability2 = ABILITY_NONE,
+		.ability2 = ABILITY_GRASSPELT,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_GRASSPELT,
+		.hiddenAbility = ABILITY_GRASSYSURGE,
 		.noFlip = TRUE,
 	},
 
@@ -25051,7 +25185,7 @@ const struct BaseStats gBaseStats[] =
 		.growthRate = GROWTH_MEDIUM_FAST,
 		.eggGroup1 = EGG_GROUP_FIELD,
 		.eggGroup2 = EGG_GROUP_FIELD,
-		.ability1 = ABILITY_KEENEYE,
+		.ability1 = ABILITY_COMPETITIVE,
 		.ability2 = ABILITY_INFILTRATOR,
 		.safariZoneFleeRate = 0,
 		.hiddenAbility = ABILITY_OWNTEMPO,
@@ -25084,10 +25218,10 @@ const struct BaseStats gBaseStats[] =
 		.growthRate = GROWTH_MEDIUM_FAST,
 		.eggGroup1 = EGG_GROUP_FIELD,
 		.eggGroup2 = EGG_GROUP_FIELD,
-		.ability1 = ABILITY_KEENEYE,
+		.ability1 = ABILITY_PRANKSTER,
 		.ability2 = ABILITY_INFILTRATOR,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_PRANKSTER,
+		.hiddenAbility = ABILITY_PSYCHICSURGE,
 		.noFlip = TRUE,
 	},
 
@@ -25217,9 +25351,9 @@ const struct BaseStats gBaseStats[] =
 		.eggGroup1 = EGG_GROUP_FAIRY,
 		.eggGroup2 = EGG_GROUP_FAIRY,
 		.ability1 = ABILITY_HEALER,
-		.ability2 = ABILITY_NONE,
+		.ability2 = ABILITY_AROMAVEIL,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_AROMAVEIL,
+		.hiddenAbility = ABILITY_REGENERATOR,
 		.noFlip = TRUE,
 	},
 
@@ -25250,9 +25384,9 @@ const struct BaseStats gBaseStats[] =
 		.eggGroup1 = EGG_GROUP_FAIRY,
 		.eggGroup2 = EGG_GROUP_FAIRY,
 		.ability1 = ABILITY_HEALER,
-		.ability2 = ABILITY_NONE,
+		.ability2 = ABILITY_AROMAVEIL,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_AROMAVEIL,
+		.hiddenAbility = ABILITY_REGENERATOR,
 		.noFlip = TRUE,
 	},
 
@@ -25283,7 +25417,7 @@ const struct BaseStats gBaseStats[] =
 		.eggGroup1 = EGG_GROUP_FAIRY,
 		.eggGroup2 = EGG_GROUP_FAIRY,
 		.ability1 = ABILITY_SWEETVEIL,
-		.ability2 = ABILITY_NONE,
+		.ability2 = ABILITY_COMPETITIVE,
 		.safariZoneFleeRate = 0,
 		.hiddenAbility = ABILITY_UNBURDEN,
 		.noFlip = TRUE,
@@ -25316,7 +25450,7 @@ const struct BaseStats gBaseStats[] =
 		.eggGroup1 = EGG_GROUP_FAIRY,
 		.eggGroup2 = EGG_GROUP_FAIRY,
 		.ability1 = ABILITY_SWEETVEIL,
-		.ability2 = ABILITY_NONE,
+		.ability2 = ABILITY_COMPETITIVE,
 		.safariZoneFleeRate = 0,
 		.hiddenAbility = ABILITY_UNBURDEN,
 		.noFlip = TRUE,
@@ -25808,8 +25942,8 @@ const struct BaseStats gBaseStats[] =
 		.eggCycles = 37,
 		.friendship = 50,
 		.growthRate = GROWTH_MEDIUM_FAST,
-		.eggGroup1 = EGG_GROUP_FAIRY,
-		.eggGroup2 = EGG_GROUP_FAIRY,
+		.eggGroup1 = EGG_GROUP_FIELD,
+		.eggGroup2 = EGG_GROUP_FIELD,
 		.ability1 = ABILITY_CUTECHARM,
 		.ability2 = ABILITY_CUTECHARM,
 		.safariZoneFleeRate = 0,
@@ -25879,7 +26013,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_CHEEKPOUCH,
 		.ability2 = ABILITY_PICKUP,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_PLUS,
+		.hiddenAbility = ABILITY_MISTYSURGE,
 		.noFlip = TRUE,
 	},
 
@@ -25910,9 +26044,9 @@ const struct BaseStats gBaseStats[] =
 		.eggGroup1 = EGG_GROUP_FAIRY,
 		.eggGroup2 = EGG_GROUP_MINERAL,
 		.ability1 = ABILITY_CLEARBODY,
-		.ability2 = ABILITY_NONE,
+		.ability2 = ABILITY_STURDY,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_STURDY,
+		.hiddenAbility = ABILITY_MISTYSURGE,
 		.noFlip = TRUE,
 	},
 
@@ -26143,7 +26277,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_PICKUP,
 		.ability2 = ABILITY_FRISK,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_INSOMNIA,
+		.hiddenAbility = ABILITY_HEATPROOF,
 		.noFlip = TRUE,
 	},
 
@@ -26176,7 +26310,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_PICKUP,
 		.ability2 = ABILITY_FRISK,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_INSOMNIA,
+		.hiddenAbility = ABILITY_HEATPROOF,
 		.noFlip = TRUE,
 	},
 
@@ -26275,7 +26409,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_FRISK,
 		.ability2 = ABILITY_INFILTRATOR,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_TELEPATHY,
+		.hiddenAbility = ABILITY_PUNKROCK,
 		.noFlip = TRUE,
 	},
 
@@ -26308,7 +26442,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_FRISK,
 		.ability2 = ABILITY_INFILTRATOR,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_TELEPATHY,
+		.hiddenAbility = ABILITY_PUNKROCK,
 		.noFlip = TRUE,
 	},
 
@@ -26341,7 +26475,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_FAIRYAURA,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_NONE,
+		.hiddenAbility = ABILITY_PIXILATE,
 		.noFlip = TRUE,
 	},
 
@@ -26374,7 +26508,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_DARKAURA,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_NONE,
+		.hiddenAbility = ABILITY_AERILATE,
 		.noFlip = TRUE,
 	},
 
@@ -26440,7 +26574,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_CLEARBODY,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_NONE,
+		.hiddenAbility = ABILITY_ANALYTIC,
 		.noFlip = TRUE,
 	},
 
@@ -26473,7 +26607,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_MAGICIAN,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_NONE,
+		.hiddenAbility = ABILITY_PRANKSTER,
 		.noFlip = TRUE,
 	},
 
@@ -26520,7 +26654,7 @@ const struct BaseStats gBaseStats[] =
 		.baseSpeed 		= 70,
 		.type1 = TYPE_FIRE,
 		.type2 = TYPE_WATER,
-		.catchRate = 3,
+		.catchRate = 6,
 		.expYield = 255,
 		.evYield_HP 		= 0,
 		.evYield_Attack 	= 0,
@@ -26539,7 +26673,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_WATERABSORB,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_NONE,
+		.hiddenAbility = ABILITY_STEAMENGINE,
 		.noFlip = TRUE,
 	},
 
@@ -26572,7 +26706,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_RIVALRY,
 		.ability2 = ABILITY_UNNERVE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_MOXIE,
+		.hiddenAbility = ABILITY_ADAPTABILITY,
 		.noFlip = TRUE,
 	},
 
@@ -26602,10 +26736,10 @@ const struct BaseStats gBaseStats[] =
 		.growthRate = GROWTH_MEDIUM_FAST,
 		.eggGroup1 = EGG_GROUP_FIELD,
 		.eggGroup2 = EGG_GROUP_FIELD,
-		.ability1 = ABILITY_KEENEYE,
+		.ability1 = ABILITY_COMPETITIVE,
 		.ability2 = ABILITY_INFILTRATOR,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_COMPETITIVE,
+		.hiddenAbility = ABILITY_PSYCHICSURGE,
 		.noFlip = TRUE,
 	},
 
@@ -26867,7 +27001,7 @@ const struct BaseStats gBaseStats[] =
 		.eggGroup1 = EGG_GROUP_FAIRY,
 		.eggGroup2 = EGG_GROUP_FAIRY,
 		.ability1 = ABILITY_FLOWERVEIL,
-		.ability2 = ABILITY_NONE,
+		.ability2 = ABILITY_AROMAVEIL,
 		.safariZoneFleeRate = 0,
 		.hiddenAbility = ABILITY_SYMBIOSIS,
 		.noFlip = TRUE,
@@ -26900,7 +27034,7 @@ const struct BaseStats gBaseStats[] =
 		.eggGroup1 = EGG_GROUP_FAIRY,
 		.eggGroup2 = EGG_GROUP_FAIRY,
 		.ability1 = ABILITY_FLOWERVEIL,
-		.ability2 = ABILITY_NONE,
+		.ability2 = ABILITY_AROMAVEIL,
 		.safariZoneFleeRate = 0,
 		.hiddenAbility = ABILITY_SYMBIOSIS,
 		.noFlip = TRUE,
@@ -26933,7 +27067,7 @@ const struct BaseStats gBaseStats[] =
 		.eggGroup1 = EGG_GROUP_FAIRY,
 		.eggGroup2 = EGG_GROUP_FAIRY,
 		.ability1 = ABILITY_FLOWERVEIL,
-		.ability2 = ABILITY_NONE,
+		.ability2 = ABILITY_AROMAVEIL,
 		.safariZoneFleeRate = 0,
 		.hiddenAbility = ABILITY_SYMBIOSIS,
 		.noFlip = TRUE,
@@ -26966,7 +27100,7 @@ const struct BaseStats gBaseStats[] =
 		.eggGroup1 = EGG_GROUP_FAIRY,
 		.eggGroup2 = EGG_GROUP_FAIRY,
 		.ability1 = ABILITY_FLOWERVEIL,
-		.ability2 = ABILITY_NONE,
+		.ability2 = ABILITY_AROMAVEIL,
 		.safariZoneFleeRate = 0,
 		.hiddenAbility = ABILITY_SYMBIOSIS,
 		.noFlip = TRUE,
@@ -26999,7 +27133,7 @@ const struct BaseStats gBaseStats[] =
 		.eggGroup1 = EGG_GROUP_FAIRY,
 		.eggGroup2 = EGG_GROUP_FAIRY,
 		.ability1 = ABILITY_FLOWERVEIL,
-		.ability2 = ABILITY_NONE,
+		.ability2 = ABILITY_AROMAVEIL,
 		.safariZoneFleeRate = 0,
 		.hiddenAbility = ABILITY_SYMBIOSIS,
 		.noFlip = TRUE,
@@ -27032,7 +27166,7 @@ const struct BaseStats gBaseStats[] =
 		.eggGroup1 = EGG_GROUP_FAIRY,
 		.eggGroup2 = EGG_GROUP_FAIRY,
 		.ability1 = ABILITY_FLOWERVEIL,
-		.ability2 = ABILITY_NONE,
+		.ability2 = ABILITY_AROMAVEIL,
 		.safariZoneFleeRate = 0,
 		.hiddenAbility = ABILITY_SYMBIOSIS,
 		.noFlip = TRUE,
@@ -27065,7 +27199,7 @@ const struct BaseStats gBaseStats[] =
 		.eggGroup1 = EGG_GROUP_FAIRY,
 		.eggGroup2 = EGG_GROUP_FAIRY,
 		.ability1 = ABILITY_FLOWERVEIL,
-		.ability2 = ABILITY_NONE,
+		.ability2 = ABILITY_AROMAVEIL,
 		.safariZoneFleeRate = 0,
 		.hiddenAbility = ABILITY_SYMBIOSIS,
 		.noFlip = TRUE,
@@ -27098,7 +27232,7 @@ const struct BaseStats gBaseStats[] =
 		.eggGroup1 = EGG_GROUP_FAIRY,
 		.eggGroup2 = EGG_GROUP_FAIRY,
 		.ability1 = ABILITY_FLOWERVEIL,
-		.ability2 = ABILITY_NONE,
+		.ability2 = ABILITY_AROMAVEIL,
 		.safariZoneFleeRate = 0,
 		.hiddenAbility = ABILITY_SYMBIOSIS,
 		.noFlip = TRUE,
@@ -27114,7 +27248,7 @@ const struct BaseStats gBaseStats[] =
 		.baseSpeed 		= 92,
 		.type1 = TYPE_FAIRY,
 		.type2 = TYPE_FAIRY,
-		.catchRate = 120,
+		.catchRate = 3,
 		.expYield = 130,
 		.evYield_HP 		= 0,
 		.evYield_Attack 	= 0,
@@ -27131,7 +27265,7 @@ const struct BaseStats gBaseStats[] =
 		.eggGroup1 = EGG_GROUP_FAIRY,
 		.eggGroup2 = EGG_GROUP_FAIRY,
 		.ability1 = ABILITY_FLOWERVEIL,
-		.ability2 = ABILITY_NONE,
+		.ability2 = ABILITY_AROMAVEIL,
 		.safariZoneFleeRate = 0,
 		.hiddenAbility = ABILITY_SYMBIOSIS,
 		.noFlip = TRUE,
@@ -27164,7 +27298,7 @@ const struct BaseStats gBaseStats[] =
 		.eggGroup1 = EGG_GROUP_FAIRY,
 		.eggGroup2 = EGG_GROUP_FAIRY,
 		.ability1 = ABILITY_FLOWERVEIL,
-		.ability2 = ABILITY_NONE,
+		.ability2 = ABILITY_AROMAVEIL,
 		.safariZoneFleeRate = 0,
 		.hiddenAbility = ABILITY_SYMBIOSIS,
 		.noFlip = TRUE,
@@ -27197,7 +27331,7 @@ const struct BaseStats gBaseStats[] =
 		.eggGroup1 = EGG_GROUP_FAIRY,
 		.eggGroup2 = EGG_GROUP_FAIRY,
 		.ability1 = ABILITY_FLOWERVEIL,
-		.ability2 = ABILITY_NONE,
+		.ability2 = ABILITY_AROMAVEIL,
 		.safariZoneFleeRate = 0,
 		.hiddenAbility = ABILITY_SYMBIOSIS,
 		.noFlip = TRUE,
@@ -27230,7 +27364,7 @@ const struct BaseStats gBaseStats[] =
 		.eggGroup1 = EGG_GROUP_FAIRY,
 		.eggGroup2 = EGG_GROUP_FAIRY,
 		.ability1 = ABILITY_FLOWERVEIL,
-		.ability2 = ABILITY_NONE,
+		.ability2 = ABILITY_AROMAVEIL,
 		.safariZoneFleeRate = 0,
 		.hiddenAbility = ABILITY_SYMBIOSIS,
 		.noFlip = TRUE,
@@ -27263,7 +27397,7 @@ const struct BaseStats gBaseStats[] =
 		.eggGroup1 = EGG_GROUP_FAIRY,
 		.eggGroup2 = EGG_GROUP_FAIRY,
 		.ability1 = ABILITY_FLOWERVEIL,
-		.ability2 = ABILITY_NONE,
+		.ability2 = ABILITY_AROMAVEIL,
 		.safariZoneFleeRate = 0,
 		.hiddenAbility = ABILITY_SYMBIOSIS,
 		.noFlip = TRUE,
@@ -27298,7 +27432,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_PICKUP,
 		.ability2 = ABILITY_FRISK,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_INSOMNIA,
+		.hiddenAbility = ABILITY_HEATPROOF,
 		.noFlip = TRUE,
 	},
 
@@ -27331,7 +27465,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_PICKUP,
 		.ability2 = ABILITY_FRISK,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_INSOMNIA,
+		.hiddenAbility = ABILITY_HEATPROOF,
 		.noFlip = TRUE,
 	},
 
@@ -27364,7 +27498,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_PICKUP,
 		.ability2 = ABILITY_FRISK,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_INSOMNIA,
+		.hiddenAbility = ABILITY_HEATPROOF,
 		.noFlip = TRUE,
 	},
 
@@ -27397,7 +27531,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_PICKUP,
 		.ability2 = ABILITY_FRISK,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_INSOMNIA,
+		.hiddenAbility = ABILITY_HEATPROOF,
 		.noFlip = TRUE,
 	},
 
@@ -27430,7 +27564,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_PICKUP,
 		.ability2 = ABILITY_FRISK,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_INSOMNIA,
+		.hiddenAbility = ABILITY_HEATPROOF,
 		.noFlip = TRUE,
 	},
 
@@ -27463,7 +27597,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_PICKUP,
 		.ability2 = ABILITY_FRISK,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_INSOMNIA,
+		.hiddenAbility = ABILITY_HEATPROOF,
 		.noFlip = TRUE,
 	},
 
@@ -28634,7 +28768,7 @@ const struct BaseStats gBaseStats[] =
 		.type2 = TYPE_GHOST,
 		.catchRate = 45,
 		.expYield = 98,
-		.evYield_HP 		= 1,
+		.evYield_HP 		= 0,
 		.evYield_Attack 	= 1,
 		.evYield_Defense 	= 1,
 		.evYield_SpAttack 	= 0,
@@ -28667,7 +28801,7 @@ const struct BaseStats gBaseStats[] =
 		.type2 = TYPE_FAIRY,
 		.catchRate = 45,
 		.expYield = 98,
-		.evYield_HP 		= 1,
+		.evYield_HP 		= 0,
 		.evYield_Attack 	= 1,
 		.evYield_Defense 	= 1,
 		.evYield_SpAttack 	= 0,
@@ -28832,7 +28966,7 @@ const struct BaseStats gBaseStats[] =
 		.type2 = TYPE_GROUND,
 		.catchRate = 150,
 		.expYield = 175,
-		.evYield_HP 		= 1,
+		.evYield_HP 		= 0,
 		.evYield_Attack 	= 1,
 		.evYield_Defense 	= 0,
 		.evYield_SpAttack 	= 1,
@@ -29407,8 +29541,8 @@ const struct BaseStats gBaseStats[] =
 		.growthRate = GROWTH_FAST,
 		.eggGroup1 = EGG_GROUP_FAIRY,
 		.eggGroup2 = EGG_GROUP_FAIRY,
-		.ability1 = ABILITY_HEALER,
-		.ability2 = ABILITY_HEALER,
+		.ability1 = ABILITY_REGENERATOR,
+		.ability2 = ABILITY_REGENERATOR,
 		.safariZoneFleeRate = 0,
 		.hiddenAbility = ABILITY_NONE,
 		.noFlip = TRUE,
@@ -30325,7 +30459,7 @@ const struct BaseStats gBaseStats[] =
 		.evYield_Speed 		= 0,
 		.item1 = ITEM_NONE,
 		.item2 = ITEM_NONE,
-		.genderRatio = PERCENT_FEMALE(50),
+		.genderRatio = PERCENT_FEMALE(12.5),
 		.eggCycles = 15,
 		.friendship = 50,
 		.growthRate = GROWTH_MEDIUM_FAST,
@@ -30598,7 +30732,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_LEVITATE,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_NONE,
+		.hiddenAbility = ABILITY_COMPOUNDEYES,
 		.noFlip = TRUE,
 	},
 
@@ -30697,7 +30831,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_DANCER,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_NONE,
+		.hiddenAbility = ABILITY_SERENEGRACE,
 		.noFlip = TRUE,
 	},
 
@@ -30826,7 +30960,7 @@ const struct BaseStats gBaseStats[] =
 		.growthRate = GROWTH_MEDIUM_FAST,
 		.eggGroup1 = EGG_GROUP_FIELD,
 		.eggGroup2 = EGG_GROUP_FIELD,
-		.ability1 = ABILITY_KEENEYE,
+		.ability1 = ABILITY_TOUGHCLAWS,
 		.ability2 = ABILITY_SANDRUSH,
 		.safariZoneFleeRate = 0,
 		.hiddenAbility = ABILITY_STEADFAST,
@@ -31091,7 +31225,7 @@ const struct BaseStats gBaseStats[] =
 		.eggGroup1 = EGG_GROUP_GRASS,
 		.eggGroup2 = EGG_GROUP_GRASS,
 		.ability1 = ABILITY_LEAFGUARD,
-		.ability2 = ABILITY_NONE,
+		.ability2 = ABILITY_CHLOROPHYLL,
 		.safariZoneFleeRate = 0,
 		.hiddenAbility = ABILITY_CONTRARY,
 		.noFlip = TRUE,
@@ -31124,7 +31258,7 @@ const struct BaseStats gBaseStats[] =
 		.eggGroup1 = EGG_GROUP_GRASS,
 		.eggGroup2 = EGG_GROUP_GRASS,
 		.ability1 = ABILITY_LEAFGUARD,
-		.ability2 = ABILITY_NONE,
+		.ability2 = ABILITY_CHLOROPHYLL,
 		.safariZoneFleeRate = 0,
 		.hiddenAbility = ABILITY_CONTRARY,
 		.noFlip = TRUE,
@@ -31156,10 +31290,10 @@ const struct BaseStats gBaseStats[] =
 		.growthRate = GROWTH_MEDIUM_FAST,
 		.eggGroup1 = EGG_GROUP_GRASS,
 		.eggGroup2 = EGG_GROUP_GRASS,
-		.ability1 = ABILITY_ILLUMINATE,
+		.ability1 = ABILITY_RAINDISH,
 		.ability2 = ABILITY_EFFECTSPORE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_RAINDISH,
+		.hiddenAbility = ABILITY_MAGICBOUNCE,
 		.noFlip = TRUE,
 	},
 
@@ -31183,16 +31317,16 @@ const struct BaseStats gBaseStats[] =
 		.evYield_Speed 		= 0,
 		.item1 = ITEM_BIG_MUSHROOM,
 		.item2 = ITEM_TINY_MUSHROOM,
-		.genderRatio = PERCENT_FEMALE(100),
+		.genderRatio = PERCENT_FEMALE(50),
 		.eggCycles = 15,
 		.friendship = 50,
 		.growthRate = GROWTH_MEDIUM_FAST,
 		.eggGroup1 = EGG_GROUP_GRASS,
 		.eggGroup2 = EGG_GROUP_GRASS,
-		.ability1 = ABILITY_ILLUMINATE,
+		.ability1 = ABILITY_RAINDISH,
 		.ability2 = ABILITY_EFFECTSPORE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_RAINDISH,
+		.hiddenAbility = ABILITY_MAGICBOUNCE,
 		.noFlip = TRUE,
 	},
 
@@ -31753,7 +31887,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_RKS_SYSTEM,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_NONE,
+		.hiddenAbility = ABILITY_SHEERFORCE,
 		.noFlip = TRUE,
 	},
 
@@ -31819,7 +31953,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_COMATOSE,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_NONE,
+		.hiddenAbility = ABILITY_SCRAPPY,
 		.noFlip = TRUE,
 	},
 
@@ -31852,7 +31986,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_SHELLARMOR,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_NONE,
+		.hiddenAbility = ABILITY_WEAKARMOR,
 		.noFlip = TRUE,
 	},
 
@@ -32017,7 +32151,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_STEELWORKER,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_NONE,
+		.hiddenAbility = ABILITY_AFTERMATH,
 		.noFlip = TRUE,
 	},
 
@@ -32347,7 +32481,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_CLEARBODY, //ABILITY_FULLMETALBODY,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_NONE,
+		.hiddenAbility = ABILITY_BATTLEARMOR,
 		.noFlip = TRUE,
 	},
 
@@ -32380,7 +32514,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_SHADOWSHIELD,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_NONE,
+		.hiddenAbility = ABILITY_LEVITATE,
 		.noFlip = TRUE,
 	},
 
@@ -32427,7 +32561,7 @@ const struct BaseStats gBaseStats[] =
 		.baseSpeed 		= 79,
 		.type1 = TYPE_BUG,
 		.type2 = TYPE_FIGHTING,
-		.catchRate = 25,
+		.catchRate = 45,
 		.expYield = 210,
 		.evYield_HP 		= 0,
 		.evYield_Attack 	= 1,
@@ -32460,7 +32594,7 @@ const struct BaseStats gBaseStats[] =
 		.baseSpeed 		= 151,
 		.type1 = TYPE_BUG,
 		.type2 = TYPE_FIGHTING,
-		.catchRate = 255,
+		.catchRate = 45,
 		.expYield = 210,
 		.evYield_HP 		= 0,
 		.evYield_Attack 	= 0,
@@ -32493,7 +32627,7 @@ const struct BaseStats gBaseStats[] =
 		.baseSpeed 		= 83,
 		.type1 = TYPE_ELECTRIC,
 		.type2 = TYPE_ELECTRIC,
-		.catchRate = 30,
+		.catchRate = 45,
 		.expYield = 210,
 		.evYield_HP 		= 0,
 		.evYield_Attack 	= 0,
@@ -32526,7 +32660,7 @@ const struct BaseStats gBaseStats[] =
 		.baseSpeed 		= 61,
 		.type1 = TYPE_STEEL,
 		.type2 = TYPE_FLYING,
-		.catchRate = 25,
+		.catchRate = 45,
 		.expYield = 210,
 		.evYield_HP 		= 0,
 		.evYield_Attack 	= 1,
@@ -32559,7 +32693,7 @@ const struct BaseStats gBaseStats[] =
 		.baseSpeed 		= 109,
 		.type1 = TYPE_GRASS,
 		.type2 = TYPE_STEEL,
-		.catchRate = 255,
+		.catchRate = 45,
 		.expYield = 210,
 		.evYield_HP 		= 0,
 		.evYield_Attack 	= 3,
@@ -32592,7 +32726,7 @@ const struct BaseStats gBaseStats[] =
 		.baseSpeed 		= 43,
 		.type1 = TYPE_DARK,
 		.type2 = TYPE_DRAGON,
-		.catchRate = 15,
+		.catchRate = 45,
 		.expYield = 210,
 		.evYield_HP 		= 3,
 		.evYield_Attack 	= 0,
@@ -32644,7 +32778,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_PRISMARMOR,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_NONE,
+		.hiddenAbility = ABILITY_MIRRORARMOR,
 		.noFlip = TRUE,
 	},
 
@@ -32677,7 +32811,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_SOULHEART,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_NONE,
+		.hiddenAbility = ABILITY_ANALYTIC,
 		.noFlip = TRUE,
 	},
 
@@ -32710,7 +32844,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_TECHNICIAN,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_NONE,
+		.hiddenAbility = ABILITY_LONGREACH,
 		.noFlip = TRUE,
 	},
 
@@ -32840,7 +32974,7 @@ const struct BaseStats gBaseStats[] =
 		.eggGroup1 = EGG_GROUP_FIELD,
 		.eggGroup2 = EGG_GROUP_FIELD,
 		.ability1 = ABILITY_SNOWCLOAK,
-		.ability2 = ABILITY_NONE,
+		.ability2 = ABILITY_ICEBODY,
 		.safariZoneFleeRate = 0,
 		.hiddenAbility = ABILITY_SLUSHRUSH,
 		.noFlip = TRUE,
@@ -32873,7 +33007,7 @@ const struct BaseStats gBaseStats[] =
 		.eggGroup1 = EGG_GROUP_FIELD,
 		.eggGroup2 = EGG_GROUP_FIELD,
 		.ability1 = ABILITY_SNOWCLOAK,
-		.ability2 = ABILITY_NONE,
+		.ability2 = ABILITY_ICEBODY,
 		.safariZoneFleeRate = 0,
 		.hiddenAbility = ABILITY_SLUSHRUSH,
 		.noFlip = TRUE,
@@ -32971,10 +33105,10 @@ const struct BaseStats gBaseStats[] =
 		.growthRate = GROWTH_MEDIUM_FAST,
 		.eggGroup1 = EGG_GROUP_FIELD,
 		.eggGroup2 = EGG_GROUP_FIELD,
-		.ability1 = ABILITY_SANDVEIL,
+		.ability1 = ABILITY_SANDFORCE,
 		.ability2 = ABILITY_TANGLINGHAIR,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_SANDFORCE,
+		.hiddenAbility = ABILITY_STEELY_SPIRIT,
 		.noFlip = TRUE,
 	},
 
@@ -33004,10 +33138,10 @@ const struct BaseStats gBaseStats[] =
 		.growthRate = GROWTH_MEDIUM_FAST,
 		.eggGroup1 = EGG_GROUP_FIELD,
 		.eggGroup2 = EGG_GROUP_FIELD,
-		.ability1 = ABILITY_SANDVEIL,
+		.ability1 = ABILITY_SANDFORCE,
 		.ability2 = ABILITY_TANGLINGHAIR,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_SANDFORCE,
+		.hiddenAbility = ABILITY_STEELY_SPIRIT,
 		.noFlip = TRUE,
 	},
 
@@ -33403,7 +33537,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_PRESSURE,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_NONE,
+		.hiddenAbility = ABILITY_LIMBER,
 		.noFlip = TRUE,
 	},
 
@@ -33436,7 +33570,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_PRESSURE,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_NONE,
+		.hiddenAbility = ABILITY_LIMBER,
 		.noFlip = TRUE,
 	},
 
@@ -33469,7 +33603,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_PRESSURE,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_NONE,
+		.hiddenAbility = ABILITY_LIMBER,
 		.noFlip = TRUE,
 	},
 
@@ -33598,7 +33732,7 @@ const struct BaseStats gBaseStats[] =
 		.growthRate = GROWTH_MEDIUM_FAST,
 		.eggGroup1 = EGG_GROUP_FIELD,
 		.eggGroup2 = EGG_GROUP_FIELD,
-		.ability1 = ABILITY_KEENEYE,
+		.ability1 = ABILITY_TOUGHCLAWS,
 		.ability2 = ABILITY_VITALSPIRIT,
 		.safariZoneFleeRate = 0,
 		.hiddenAbility = ABILITY_NOGUARD,
@@ -33667,7 +33801,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_RKS_SYSTEM,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_NONE,
+		.hiddenAbility = ABILITY_SHEERFORCE,
 		.noFlip = TRUE,
 	},
 
@@ -33700,7 +33834,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_RKS_SYSTEM,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_NONE,
+		.hiddenAbility = ABILITY_SHEERFORCE,
 		.noFlip = TRUE,
 	},
 
@@ -33733,7 +33867,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_RKS_SYSTEM,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_NONE,
+		.hiddenAbility = ABILITY_SHEERFORCE,
 		.noFlip = TRUE,
 	},
 
@@ -33766,7 +33900,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_RKS_SYSTEM,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_NONE,
+		.hiddenAbility = ABILITY_SHEERFORCE,
 		.noFlip = TRUE,
 	},
 
@@ -33799,7 +33933,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_RKS_SYSTEM,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_NONE,
+		.hiddenAbility = ABILITY_SHEERFORCE,
 		.noFlip = TRUE,
 	},
 
@@ -33832,7 +33966,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_RKS_SYSTEM,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_NONE,
+		.hiddenAbility = ABILITY_SHEERFORCE,
 		.noFlip = TRUE,
 	},
 
@@ -33865,7 +33999,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_RKS_SYSTEM,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_NONE,
+		.hiddenAbility = ABILITY_SHEERFORCE,
 		.noFlip = TRUE,
 	},
 
@@ -33898,7 +34032,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_RKS_SYSTEM,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_NONE,
+		.hiddenAbility = ABILITY_SHEERFORCE,
 		.noFlip = TRUE,
 	},
 
@@ -33931,7 +34065,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_RKS_SYSTEM,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_NONE,
+		.hiddenAbility = ABILITY_SHEERFORCE,
 		.noFlip = TRUE,
 	},
 
@@ -33964,7 +34098,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_RKS_SYSTEM,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_NONE,
+		.hiddenAbility = ABILITY_SHEERFORCE,
 		.noFlip = TRUE,
 	},
 
@@ -33997,7 +34131,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_RKS_SYSTEM,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_NONE,
+		.hiddenAbility = ABILITY_SHEERFORCE,
 		.noFlip = TRUE,
 	},
 
@@ -34030,7 +34164,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_RKS_SYSTEM,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_NONE,
+		.hiddenAbility = ABILITY_SHEERFORCE,
 		.noFlip = TRUE,
 	},
 
@@ -34063,7 +34197,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_RKS_SYSTEM,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_NONE,
+		.hiddenAbility = ABILITY_SHEERFORCE,
 		.noFlip = TRUE,
 	},
 
@@ -34096,7 +34230,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_RKS_SYSTEM,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_NONE,
+		.hiddenAbility = ABILITY_SHEERFORCE,
 		.noFlip = TRUE,
 	},
 
@@ -34129,7 +34263,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_RKS_SYSTEM,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_NONE,
+		.hiddenAbility = ABILITY_SHEERFORCE,
 		.noFlip = TRUE,
 	},
 
@@ -34162,7 +34296,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_RKS_SYSTEM,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_NONE,
+		.hiddenAbility = ABILITY_SHEERFORCE,
 		.noFlip = TRUE,
 	},
 
@@ -34195,7 +34329,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_RKS_SYSTEM,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_NONE,
+		.hiddenAbility = ABILITY_SHEERFORCE,
 		.noFlip = TRUE,
 	},
 
@@ -34657,7 +34791,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_VOLTABSORB,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_NONE,
+		.hiddenAbility = ABILITY_ANTICIPATION,
 		.noFlip = TRUE,
 	},
 
@@ -34822,7 +34956,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_MAGNETPULL,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_NONE,
+		.hiddenAbility = ABILITY_CLEARBODY,
 		.noFlip = TRUE,
 	},
 	
@@ -34855,7 +34989,7 @@ const struct BaseStats gBaseStats[] =
 		.ability1 = ABILITY_IRONFIST,
 		.ability2 = ABILITY_NONE,
 		.safariZoneFleeRate = 0,
-		.hiddenAbility = ABILITY_NONE,
+		.hiddenAbility = ABILITY_CLEARBODY,
 		.noFlip = TRUE,
 	},
 	
@@ -35498,8 +35632,8 @@ const struct BaseStats gBaseStats[] =
 		.type2 = TYPE_GRASS,
 		.catchRate = 45,
 		.expYield = 210,
-		.evYield_HP 		= 3,
-		.evYield_Attack 	= 0,
+		.evYield_HP 		= 0,
+		.evYield_Attack 	= 3,
 		.evYield_Defense 	= 0,
 		.evYield_SpAttack 	= 0,
 		.evYield_SpDefense 	= 0,
diff --git a/src/Egg_Moves.c b/src/Egg_Moves.c
index ad31766..7cf0b96 100644
--- a/src/Egg_Moves.c
+++ b/src/Egg_Moves.c
@@ -108,7 +108,8 @@ const u16 gEggMoves[] =
 		MOVE_SWITCHEROO,
 		MOVE_IRONTAIL,
 		MOVE_SUCKERPUNCH,
-		MOVE_SNATCH),
+		MOVE_SNATCH,
+		MOVE_TOXICSPIKES),
 
 	egg_moves(SANDSHREW,
 		MOVE_FLAIL,
@@ -295,7 +296,8 @@ const u16 gEggMoves[] =
 		MOVE_FOCUSPUNCH,
 		MOVE_SLEEPTALK,
 		MOVE_NIGHTSLASH,
-		MOVE_POWERTRIP),
+		MOVE_POWERTRIP,
+		MOVE_THUNDEROUSKICK),
 
 	egg_moves(GROWLITHE,
 		MOVE_BODYSLAM,
@@ -348,7 +350,6 @@ const u16 gEggMoves[] =
 		MOVE_ENCORE,
 		MOVE_SMELLINGSALTS,
 		MOVE_COUNTER,
-		MOVE_CLOSECOMBAT,
 		MOVE_FIREPUNCH,
 		MOVE_THUNDERPUNCH,
 		MOVE_ICEPUNCH,
@@ -357,7 +358,8 @@ const u16 gEggMoves[] =
 		MOVE_HEAVYSLAM,
 		MOVE_KNOCKOFF,
 		MOVE_TICKLE,
-		MOVE_QUICKGUARD),
+		MOVE_QUICKGUARD,
+		MOVE_VITALTHROW),
 
 	egg_moves(BELLSPROUT,
 		MOVE_ENCORE,
@@ -530,6 +532,7 @@ const u16 gEggMoves[] =
 		MOVE_BLOCK,
 		MOVE_DEFENSECURL,
 		MOVE_ROLLOUT,
+		MOVE_ROCKTHROW,
 		MOVE_ROCKBLAST,
 		MOVE_ROCKCLIMB,
 		MOVE_HEAVYSLAM,
@@ -645,7 +648,9 @@ const u16 gEggMoves[] =
 		MOVE_ROCKCLIMB,
 		MOVE_ROTOTILLER,
 		MOVE_METALBURST,
-		MOVE_GUARDSPLIT),
+		MOVE_GUARDSPLIT,
+		MOVE_ROCKPOLISH,
+		MOVE_HEADSMASH),
 
 	egg_moves(CHANSEY,
 		MOVE_PRESENT,
@@ -970,8 +975,8 @@ const u16 gEggMoves[] =
 		MOVE_ELECTROWEB,
 		MOVE_RAGEPOWDER,
 		MOVE_NIGHTSLASH,
-		MOVE_MEGAHORN,
-		MOVE_LUNGE),
+		MOVE_LUNGE,
+		MOVE_FIRSTIMPRESSION),
 
 	egg_moves(CHINCHOU,
 		MOVE_FLAIL,
@@ -1047,7 +1052,8 @@ const u16 gEggMoves[] =
 		MOVE_SECRETPOWER,
 		MOVE_STOREDPOWER,
 		MOVE_MORNINGSUN,
-		MOVE_AERIALACE),
+		MOVE_BESTOW,
+		MOVE_SOFTBOILED),
 
 	egg_moves(NATU,
 		MOVE_HAZE,
@@ -1148,7 +1154,8 @@ const u16 gEggMoves[] =
 		MOVE_BIDE,
 		MOVE_NATURALGIFT,
 		MOVE_MORNINGSUN,
-		MOVE_GRASSYTERRAIN),
+		MOVE_GRASSYTERRAIN,
+		MOVE_SEEDFLARE),
 
 	egg_moves(YANMA,
 		MOVE_WHIRLWIND,
@@ -1301,8 +1308,8 @@ const u16 gEggMoves[] =
 		MOVE_SIGNALBEAM,
 		MOVE_AQUAJET,
 		MOVE_WATERPULSE,
-		MOVE_BRINE,
-		MOVE_ACIDSPRAY),
+		MOVE_ACIDSPRAY,
+		MOVE_ANCHORSHOT),
 
 	egg_moves(SHUCKLE,
 		MOVE_SWEETSCENT,
@@ -1428,20 +1435,13 @@ const u16 gEggMoves[] =
 		MOVE_ENTRAINMENT),
 
 	egg_moves(DELIBIRD,
-		MOVE_AURORABEAM,
 		MOVE_QUICKATTACK,
 		MOVE_FUTURESIGHT,
 		MOVE_SPLASH,
 		MOVE_RAPIDSPIN,
 		MOVE_ICEBALL,
 		MOVE_ICESHARD,
-		MOVE_ICEPUNCH,
-		MOVE_FAKEOUT,
-		MOVE_BESTOW,
-		MOVE_ICYWIND,
-		MOVE_FREEZEDRY,
 		MOVE_DESTINYBOND,
-		MOVE_SPIKES,
 		MOVE_COUNTER,
 		MOVE_MEMENTO),
 
@@ -1474,18 +1474,18 @@ const u16 gEggMoves[] =
 	egg_moves(HOUNDOUR,
 		MOVE_FIRESPIN,
 		MOVE_RAGE,
-		MOVE_PURSUIT,
 		MOVE_COUNTER,
 		MOVE_SPITE,
 		MOVE_REVERSAL,
 		MOVE_BEATUP,
 		MOVE_FIREFANG,
 		MOVE_THUNDERFANG,
-		MOVE_NASTYPLOT,
-		MOVE_PUNISHMENT,
+		MOVE_BEATUP,
+		MOVE_FEINTATTACK,
 		MOVE_FEINT,
 		MOVE_SUCKERPUNCH,
-		MOVE_DESTINYBOND),
+		MOVE_DESTINYBOND,
+		MOVE_ODORSLEUTH),
 
 	egg_moves(PHANPY,
 		MOVE_FOCUSENERGY,
@@ -1941,7 +1941,8 @@ const u16 gEggMoves[] =
 		MOVE_ENDURE,
 		MOVE_EARTHPOWER,
 		MOVE_BUGBITE,
-		MOVE_SIGNALBEAM),
+		MOVE_SIGNALBEAM,
+		MOVE_FIRSTIMPRESSION),
 
 	egg_moves(MAKUHITA,
 		MOVE_FEINTATTACK,
@@ -1949,15 +1950,15 @@ const u16 gEggMoves[] =
 		MOVE_FORESIGHT,
 		MOVE_HELPINGHAND,
 		MOVE_CROSSCHOP,
-		MOVE_REVENGE,
 		MOVE_DYNAMICPUNCH,
 		MOVE_COUNTER,
 		MOVE_WAKEUPSLAP,
 		MOVE_BULLETPUNCH,
 		MOVE_FEINT,
-		MOVE_WIDEGUARD,
 		MOVE_FOCUSPUNCH,
-		MOVE_CHIPAWAY),
+		MOVE_CHIPAWAY,
+		MOVE_VITALTHROW,
+		MOVE_STORMTHROW),
 
 	egg_moves(ELECTRIKE,
 		MOVE_CRUNCH,
@@ -2067,7 +2068,8 @@ const u16 gEggMoves[] =
 		MOVE_WHIRLWIND,
 		MOVE_LUCKYCHANT,
 		MOVE_ENDURE,
-		MOVE_SIMPLEBEAM),
+		MOVE_SIMPLEBEAM,
+		MOVE_RECOVER),
 
 	egg_moves(PLUSLE,
 		MOVE_WISH,
@@ -2348,7 +2350,8 @@ const u16 gEggMoves[] =
 		MOVE_CAPTIVATE,
 		MOVE_FAKETEARS,
 		MOVE_CONFUSERAY,
-		MOVE_AROMATHERAPY),
+		MOVE_AROMATHERAPY,
+		MOVE_TAILGLOW),
 
 	egg_moves(LILEEP,
 		MOVE_BARRIER,
@@ -2370,7 +2373,8 @@ const u16 gEggMoves[] =
 		MOVE_CURSE,
 		MOVE_IRONDEFENSE,
 		MOVE_WATERPULSE,
-		MOVE_AQUAJET),
+		MOVE_AQUAJET,
+		MOVE_ACCELEROCK),
 
 	egg_moves(RALTS,
 		MOVE_DISABLE,
@@ -2507,7 +2511,8 @@ const u16 gEggMoves[] =
 		MOVE_SIGNALBEAM,
 		MOVE_HELPINGHAND,
 		MOVE_EERIEIMPULSE,
-		MOVE_FAKETEARS),
+		MOVE_FAKETEARS,
+		MOVE_DISCHARGE),
 
 	egg_moves(BUDEW,
 		MOVE_SPIKES,
@@ -2569,7 +2574,9 @@ const u16 gEggMoves[] =
 		MOVE_BABYDOLLEYES),
 
 	egg_moves(BUIZEL,
+		MOVE_PURSUIT,
 		MOVE_MUDSLAP,
+		MOVE_MUDSHOT,
 		MOVE_HEADBUTT,
 		MOVE_FURYSWIPES,
 		MOVE_SLASH,
@@ -2581,8 +2588,8 @@ const u16 gEggMoves[] =
 		MOVE_AQUARING,
 		MOVE_MEFIRST,
 		MOVE_SWITCHEROO,
-		MOVE_TAILSLAP,
 		MOVE_SOAK,
+		MOVE_WHIRLPOOL,
 		MOVE_HELPINGHAND),
 
 	egg_moves(CHERUBI,
@@ -2938,7 +2945,8 @@ const u16 gEggMoves[] =
 		MOVE_NIGHTSLASH,
 		MOVE_TRUMPCARD,
 		MOVE_SCREECH,
-		MOVE_SACREDSWORD),
+		MOVE_SACREDSWORD,
+		MOVE_SECRETSWORD),
 
 	egg_moves(PATRAT,
 		MOVE_FORESIGHT,
@@ -2949,7 +2957,8 @@ const u16 gEggMoves[] =
 		MOVE_REVENGE,
 		MOVE_FLAIL,
 		MOVE_TEARFULLOOK,
-		MOVE_BULLETSEED),
+		MOVE_BULLETSEED,
+		MOVE_BIDE),
 
 	egg_moves(LILLIPUP,
 		MOVE_HOWL,
@@ -2976,7 +2985,9 @@ const u16 gEggMoves[] =
 		MOVE_YAWN,
 		MOVE_COVET,
 		MOVE_COPYCAT,
-		MOVE_QUICKATTACK),
+		MOVE_DOUBLETEAM,
+		MOVE_QUICKATTACK,
+		MOVE_NIGHTDAZE),
 
 	egg_moves(PANSAGE,
 		MOVE_COVET,
@@ -3203,7 +3214,10 @@ const u16 gEggMoves[] =
 		MOVE_COUNTER,
 		MOVE_MEANLOOK,
 		MOVE_MEFIRST,
-		MOVE_POWERTRIP),
+		MOVE_AQUATAIL,
+		MOVE_SPITE,
+		MOVE_ASSURANCE,
+		MOVE_MUDSLAP),
 
 	egg_moves(DARUMAKA,
 		MOVE_SLEEPTALK,
@@ -3227,7 +3241,8 @@ const u16 gEggMoves[] =
 		MOVE_WOODHAMMER,
 		MOVE_SPIKES,
 		MOVE_GRASSWHISTLE,
-		MOVE_GRASSYTERRAIN),
+		MOVE_GRASSYTERRAIN,
+		MOVE_TAILGLOW),
 
 	egg_moves(DWEBBLE,
 		MOVE_ENDURE,
@@ -3240,14 +3255,14 @@ const u16 gEggMoves[] =
 		MOVE_BLOCK,
 		MOVE_WIDEGUARD,
 		MOVE_ROTOTILLER,
-		MOVE_KNOCKOFF),
+		MOVE_KNOCKOFF,
+		MOVE_FIRSTIMPRESSION),
 
 	egg_moves(SCRAGGY,
 		MOVE_DRAINPUNCH,
 		MOVE_COUNTER,
 		MOVE_DRAGONDANCE,
 		MOVE_DETECT,
-		MOVE_FAKEOUT,
 		MOVE_FIREPUNCH,
 		MOVE_ICEPUNCH,
 		MOVE_THUNDERPUNCH,
@@ -3255,8 +3270,11 @@ const u16 gEggMoves[] =
 		MOVE_FEINTATTACK,
 		MOVE_ZENHEADBUTT,
 		MOVE_QUICKGUARD,
-		MOVE_POWERUPPUNCH,
-		MOVE_ACIDSPRAY),
+		MOVE_ACIDSPRAY,
+		MOVE_FEINTATTACK,
+		MOVE_CHIPAWAY,
+		MOVE_BEATUP,
+		MOVE_FOCUSPUNCH),
 
 	egg_moves(SIGILYPH,
 		MOVE_STOREDPOWER,
@@ -3275,9 +3293,8 @@ const u16 gEggMoves[] =
 		MOVE_HEALBLOCK,
 		MOVE_IMPRISON,
 		MOVE_NIGHTMARE,
-		MOVE_DISABLE,
 		MOVE_TOXICSPIKES,
-		MOVE_CRAFTYSHIELD),
+		MOVE_OMINOUSWIND),
 
 	egg_moves(TIRTOUGA,
 		MOVE_WATERPULSE,
@@ -3322,7 +3339,9 @@ const u16 gEggMoves[] =
 		MOVE_SUCKERPUNCH,
 		MOVE_EXTRASENSORY,
 		MOVE_COUNTER,
-		MOVE_COPYCAT),
+		MOVE_COPYCAT,
+		MOVE_EMBARGO,
+		MOVE_FEINTATTACK),
 
 	egg_moves(MINCCINO,
 		MOVE_IRONTAIL,
@@ -3333,7 +3352,8 @@ const u16 gEggMoves[] =
 		MOVE_FAKETEARS,
 		MOVE_SLEEPTALK,
 		MOVE_ENDURE,
-		MOVE_FLAIL),
+		MOVE_FLAIL,
+		MOVE_BONERUSH),
 
 	egg_moves(GOTHITA,
 		MOVE_MIRRORCOAT,
@@ -3389,7 +3409,8 @@ const u16 gEggMoves[] =
 		MOVE_SLEEPTALK,
 		MOVE_BATONPASS,
 		MOVE_GRASSWHISTLE,
-		MOVE_HEADBUTT),
+		MOVE_HEADBUTT,
+		MOVE_TROPKICK),
 
 	egg_moves(EMOLGA,
 		MOVE_ROOST,
@@ -3467,7 +3488,6 @@ const u16 gEggMoves[] =
 		MOVE_KNOCKOFF),
 
 	egg_moves(ELGYEM,
-		MOVE_TELEPORT,
 		MOVE_DISABLE,
 		MOVE_ASTONISH,
 		MOVE_POWERSWAP,
@@ -3499,6 +3519,7 @@ const u16 gEggMoves[] =
 		MOVE_IRONTAIL,
 		MOVE_DRAGONPULSE,
 		MOVE_HARDEN,
+		MOVE_BITE,
 		MOVE_FIRSTIMPRESSION),
 
 	egg_moves(CUBCHOO,
@@ -3526,8 +3547,6 @@ const u16 gEggMoves[] =
 		MOVE_TOXICSPIKES),
 
 	egg_moves(STUNFISK,
-		MOVE_SHOCKWAVE,
-		MOVE_EARTHPOWER,
 		MOVE_YAWN,
 		MOVE_SLEEPTALK,
 		MOVE_ASTONISH,
@@ -3537,10 +3556,10 @@ const u16 gEggMoves[] =
 		MOVE_PAINSPLIT,
 		MOVE_EERIEIMPULSE,
 		MOVE_REFLECTTYPE,
-		MOVE_MEFIRST),
+		MOVE_MEFIRST,
+		MOVE_SHOREUP),
 
 	egg_moves(MIENFOO,
-		MOVE_ENDURE,
 		MOVE_VITALTHROW,
 		MOVE_BATONPASS,
 		MOVE_SMELLINGSALTS,
@@ -3552,7 +3571,7 @@ const u16 gEggMoves[] =
 	egg_moves(DRUDDIGON,
 		MOVE_FIREFANG,
 		MOVE_THUNDERFANG,
-		MOVE_CRUSHCLAW,
+		MOVE_CHIPAWAY,
 		MOVE_FEINTATTACK,
 		MOVE_PURSUIT,
 		MOVE_IRONTAIL,
@@ -3563,14 +3582,14 @@ const u16 gEggMoves[] =
 		MOVE_SUCKERPUNCH),
 
 	egg_moves(PAWNIARD,
-		MOVE_REVENGE,
 		MOVE_SUCKERPUNCH,
-		MOVE_PURSUIT,
 		MOVE_HEADBUTT,
 		MOVE_STEALTHROCK,
 		MOVE_PSYCHOCUT,
 		MOVE_MEANLOOK,
-		MOVE_QUICKGUARD),
+		MOVE_QUICKGUARD,
+		MOVE_FEINTATTACK,
+		MOVE_EMBARGO),
 
 	egg_moves(BOUFFALANT,
 		MOVE_STOMP,
@@ -3591,14 +3610,16 @@ const u16 gEggMoves[] =
 		MOVE_SCARYFACE,
 		MOVE_KNOCKOFF,
 		MOVE_FAKETEARS,
-		MOVE_FOULPLAY),
+		MOVE_FOULPLAY,
+		MOVE_TOXIC,
+		MOVE_FEINTATTACK),
 
 	egg_moves(HEATMOR,
 		MOVE_PURSUIT,
 		MOVE_WRAP,
 		MOVE_NIGHTSLASH,
 		MOVE_CURSE,
-		MOVE_BODYSLAM,
+		MOVE_BIND,
 		MOVE_HEATWAVE,
 		MOVE_FEINTATTACK,
 		MOVE_SUCKERPUNCH,
@@ -3740,10 +3761,14 @@ const u16 gEggMoves[] =
 	egg_moves(FLETCHLING,
 		MOVE_TAILWIND,
 		MOVE_SNATCH,
-		MOVE_QUICKGUARD),
+		MOVE_QUICKGUARD,
+		MOVE_FLAMECHARGE,
+		MOVE_DEFOG,
+		MOVE_RAZORWIND),
 
 	egg_moves(LITLEO,
 		MOVE_ENTRAINMENT,
+		MOVE_HEADBUTT,
 		MOVE_YAWN,
 		MOVE_SNATCH,
 		MOVE_FIRESPIN,
@@ -3767,7 +3792,10 @@ const u16 gEggMoves[] =
 		MOVE_QUICKGUARD,
 		MOVE_FOULPLAY,
 		MOVE_STORMTHROW,
-		MOVE_POWERTRIP),
+		MOVE_POWERTRIP,
+		MOVE_SEISMICTOSS,
+		MOVE_KARATECHOP,
+		MOVE_VITALTHROW),
 
 	egg_moves(FURFROU,
 		MOVE_ROLEPLAY,
@@ -3858,7 +3886,9 @@ const u16 gEggMoves[] =
 		MOVE_BARRIER,
 		MOVE_MIRRORCOAT,
 		MOVE_MAGNETRISE,
-		MOVE_DISCHARGE),
+		MOVE_DISCHARGE,
+		MOVE_TAKEDOWN,
+		MOVE_REFLECTTYPE),
 
 	egg_moves(HAWLUCHA,
 		MOVE_AGILITY,
@@ -4037,8 +4067,8 @@ const u16 gEggMoves[] =
 
 	egg_moves(ROCKRUFF,
 		MOVE_CRUSHCLAW,
-		MOVE_FIREFANG,
 		MOVE_THUNDERFANG,
+		MOVE_FIREFANG,
 		MOVE_SUCKERPUNCH,
 		MOVE_THRASH),
 
@@ -4152,7 +4182,8 @@ const u16 gEggMoves[] =
 		MOVE_STOCKPILE,
 		MOVE_SWALLOW,
 		MOVE_SPITUP,
-		MOVE_CURSE),
+		MOVE_CURSE,
+		MOVE_STRENGTHSAP),
 
 	egg_moves(PYUKUMUKU,
 		MOVE_ENDURE,
@@ -4485,11 +4516,9 @@ const u16 gEggMoves[] =
 	
 	egg_moves(MEOWTH_G,
 		MOVE_COVET,
-		MOVE_CURSE,
-		MOVE_DOUBLEEDGE,
-		MOVE_FLAIL,
-		MOVE_NIGHTSLASH,
-		MOVE_SPITE),
+		MOVE_ASSURANCE,
+		MOVE_CAPTIVATE,
+		MOVE_NIGHTDAZE),
 
 	egg_moves(GEODUDE_A,
 		MOVE_BLOCK,
diff --git a/src/Learnsets.c b/src/Learnsets.c
index 4eec53e..d9e3fb4 100644
--- a/src/Learnsets.c
+++ b/src/Learnsets.c
@@ -253,14 +253,16 @@ static const struct LevelUpMove sBeedrillLevelUpLearnset[] = {
 	LEVEL_UP_MOVE(14, MOVE_RAGE),
 	LEVEL_UP_MOVE(17, MOVE_PURSUIT),
 	LEVEL_UP_MOVE(20, MOVE_FOCUSENERGY),
-	LEVEL_UP_MOVE(23, MOVE_VENOSHOCK),
-	LEVEL_UP_MOVE(26, MOVE_ASSURANCE),
+	LEVEL_UP_MOVE(22, MOVE_ASSURANCE),
+	LEVEL_UP_MOVE(25, MOVE_CROSSPOISON),
 	LEVEL_UP_MOVE(29, MOVE_TOXICSPIKES),
-	LEVEL_UP_MOVE(32, MOVE_PINMISSILE),
-	LEVEL_UP_MOVE(35, MOVE_POISONJAB),
-	LEVEL_UP_MOVE(38, MOVE_AGILITY),
-	LEVEL_UP_MOVE(41, MOVE_ENDEAVOR),
-	LEVEL_UP_MOVE(44, MOVE_FELLSTINGER),
+	LEVEL_UP_MOVE(31, MOVE_NEEDLEARM),
+	LEVEL_UP_MOVE(34, MOVE_FELLSTINGER),
+	LEVEL_UP_MOVE(37, MOVE_ENDEAVOR),
+	LEVEL_UP_MOVE(40, MOVE_POISONJAB),
+	LEVEL_UP_MOVE(43, MOVE_PINMISSILE),
+	LEVEL_UP_MOVE(47, MOVE_AGILITY),
+	LEVEL_UP_MOVE(49, MOVE_OUTRAGE),
 	LEVEL_UP_END
 };
 
@@ -392,11 +394,12 @@ static const struct LevelUpMove sFearowLevelUpLearnset[] = {
 	LEVEL_UP_MOVE(15, MOVE_AERIALACE),
 	LEVEL_UP_MOVE(18, MOVE_MIRRORMOVE),
 	LEVEL_UP_MOVE(23, MOVE_ASSURANCE),
-	LEVEL_UP_MOVE(27, MOVE_AGILITY),
-	LEVEL_UP_MOVE(32, MOVE_FOCUSENERGY),
-	LEVEL_UP_MOVE(36, MOVE_ROOST),
-	LEVEL_UP_MOVE(41, MOVE_DRILLPECK),
-	LEVEL_UP_MOVE(45, MOVE_DRILLRUN),
+	LEVEL_UP_MOVE(26, MOVE_AGILITY),
+	LEVEL_UP_MOVE(30, MOVE_FOCUSENERGY),
+	LEVEL_UP_MOVE(34, MOVE_ROOST),
+	LEVEL_UP_MOVE(39, MOVE_DRILLPECK),
+	LEVEL_UP_MOVE(44, MOVE_DRILLRUN),
+	LEVEL_UP_MOVE(50, MOVE_BEAKBLAST),
 	LEVEL_UP_END
 };
 
@@ -499,7 +502,7 @@ static const struct LevelUpMove sSandshrewLevelUpLearnset[] = {
 	LEVEL_UP_MOVE(46, MOVE_EARTHQUAKE),
 	LEVEL_UP_END
 };
-
+	
 static const struct LevelUpMove sSandslashLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 0, MOVE_CRUSHCLAW),
 	LEVEL_UP_MOVE( 1, MOVE_CRUSHCLAW),
@@ -714,6 +717,27 @@ static const struct LevelUpMove sJigglypuffLevelUpLearnset[] = {
 };
 
 static const struct LevelUpMove sWigglytuffLevelUpLearnset[] = {
+	LEVEL_UP_MOVE( 1, MOVE_FLEURCANNON),
+	LEVEL_UP_MOVE( 1, MOVE_DISABLE),
+	LEVEL_UP_MOVE( 1, MOVE_CHARM),
+	LEVEL_UP_MOVE( 1, MOVE_POUND),
+	LEVEL_UP_MOVE( 1, MOVE_COPYCAT),
+	LEVEL_UP_MOVE( 1, MOVE_DEFENSECURL),
+	LEVEL_UP_MOVE( 1, MOVE_ECHOEDVOICE),
+	LEVEL_UP_MOVE( 1, MOVE_COVET),
+	LEVEL_UP_MOVE( 1, MOVE_PLAYNICE),
+	LEVEL_UP_MOVE( 1, MOVE_STOCKPILE),
+	LEVEL_UP_MOVE( 1, MOVE_SWALLOW),
+	LEVEL_UP_MOVE( 1, MOVE_SPITUP),
+	LEVEL_UP_MOVE( 1, MOVE_DOUBLESLAP),
+	LEVEL_UP_MOVE( 1, MOVE_ROLLOUT),
+	LEVEL_UP_MOVE( 1, MOVE_ROUND),
+	LEVEL_UP_MOVE( 1, MOVE_WAKEUPSLAP),
+	LEVEL_UP_MOVE( 1, MOVE_REST),
+	LEVEL_UP_MOVE( 1, MOVE_MIMIC),
+	LEVEL_UP_MOVE( 1, MOVE_GYROBALL),
+	LEVEL_UP_MOVE( 1, MOVE_PLAYROUGH),
+	LEVEL_UP_MOVE( 1, MOVE_HYPERVOICE),
 	LEVEL_UP_MOVE( 1, MOVE_DOUBLEEDGE),
 	LEVEL_UP_MOVE( 1, MOVE_PLAYROUGH),
 	LEVEL_UP_MOVE( 1, MOVE_SING),
@@ -1005,6 +1029,7 @@ static const struct LevelUpMove sPsyduckLevelUpLearnset[] = {
 };
 
 static const struct LevelUpMove sGolduckLevelUpLearnset[] = {
+	LEVEL_UP_MOVE( 0, MOVE_POWERGEM),
 	LEVEL_UP_MOVE( 1, MOVE_MEFIRST),
 	LEVEL_UP_MOVE( 1, MOVE_AQUAJET),
 	LEVEL_UP_MOVE( 1, MOVE_WATERSPORT),
@@ -1021,6 +1046,7 @@ static const struct LevelUpMove sGolduckLevelUpLearnset[] = {
 	LEVEL_UP_MOVE(25, MOVE_ZENHEADBUTT),
 	LEVEL_UP_MOVE(28, MOVE_AQUATAIL),
 	LEVEL_UP_MOVE(31, MOVE_SOAK),
+	LEVEL_UP_MOVE(32, MOVE_POWERGEM),
 	LEVEL_UP_MOVE(36, MOVE_PSYCHUP),
 	LEVEL_UP_MOVE(41, MOVE_AMNESIA),
 	LEVEL_UP_MOVE(46, MOVE_HYDROPUMP),
@@ -1209,18 +1235,20 @@ static const struct LevelUpMove sMachopLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 3, MOVE_FOCUSENERGY),
 	LEVEL_UP_MOVE( 7, MOVE_KARATECHOP),
 	LEVEL_UP_MOVE( 9, MOVE_FORESIGHT),
-	LEVEL_UP_MOVE(13, MOVE_LOWSWEEP),
-	LEVEL_UP_MOVE(15, MOVE_SEISMICTOSS),
-	LEVEL_UP_MOVE(19, MOVE_REVENGE),
-	LEVEL_UP_MOVE(21, MOVE_KNOCKOFF),
-	LEVEL_UP_MOVE(25, MOVE_VITALTHROW),
-	LEVEL_UP_MOVE(27, MOVE_WAKEUPSLAP),
+	LEVEL_UP_MOVE(12, MOVE_KNOCKOFF),
+	LEVEL_UP_MOVE(16, MOVE_LOWSWEEP),
+	LEVEL_UP_MOVE(20, MOVE_SCARYFACE),
+	LEVEL_UP_MOVE(23, MOVE_WAKEUPSLAP),
+	LEVEL_UP_MOVE(27, MOVE_STRENGTH),
 	LEVEL_UP_MOVE(31, MOVE_DUALCHOP),
-	LEVEL_UP_MOVE(33, MOVE_SUBMISSION),
-	LEVEL_UP_MOVE(37, MOVE_BULKUP),
-	LEVEL_UP_MOVE(39, MOVE_CROSSCHOP),
-	LEVEL_UP_MOVE(43, MOVE_SCARYFACE),
-	LEVEL_UP_MOVE(45, MOVE_DYNAMICPUNCH),
+	LEVEL_UP_MOVE(35, MOVE_BULKUP),
+	LEVEL_UP_MOVE(38, MOVE_SUBMISSION),
+	LEVEL_UP_MOVE(42, MOVE_SEISMICTOSS),
+	LEVEL_UP_MOVE(46, MOVE_REVENGE),
+	LEVEL_UP_MOVE(50, MOVE_DOUBLEEDGE),
+	LEVEL_UP_MOVE(54, MOVE_CROSSCHOP),
+	LEVEL_UP_MOVE(58, MOVE_DYNAMICPUNCH),
+	LEVEL_UP_MOVE(62, MOVE_CLOSECOMBAT),
 	LEVEL_UP_END
 };
 
@@ -1229,21 +1257,21 @@ static const struct LevelUpMove sMachokeLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_LEER),
 	LEVEL_UP_MOVE( 1, MOVE_FOCUSENERGY),
 	LEVEL_UP_MOVE( 1, MOVE_KARATECHOP),
-	LEVEL_UP_MOVE( 3, MOVE_FOCUSENERGY),
-	LEVEL_UP_MOVE( 7, MOVE_KARATECHOP),
-	LEVEL_UP_MOVE( 9, MOVE_FORESIGHT),
-	LEVEL_UP_MOVE(13, MOVE_LOWSWEEP),
-	LEVEL_UP_MOVE(15, MOVE_SEISMICTOSS),
-	LEVEL_UP_MOVE(19, MOVE_REVENGE),
-	LEVEL_UP_MOVE(21, MOVE_KNOCKOFF),
-	LEVEL_UP_MOVE(25, MOVE_VITALTHROW),
-	LEVEL_UP_MOVE(27, MOVE_WAKEUPSLAP),
-	LEVEL_UP_MOVE(33, MOVE_DUALCHOP),
-	LEVEL_UP_MOVE(37, MOVE_SUBMISSION),
-	LEVEL_UP_MOVE(43, MOVE_BULKUP),
-	LEVEL_UP_MOVE(47, MOVE_CROSSCHOP),
-	LEVEL_UP_MOVE(53, MOVE_SCARYFACE),
-	LEVEL_UP_MOVE(57, MOVE_DYNAMICPUNCH),
+	LEVEL_UP_MOVE( 1, MOVE_FORESIGHT),
+	LEVEL_UP_MOVE(12, MOVE_KNOCKOFF),
+	LEVEL_UP_MOVE(16, MOVE_LOWSWEEP),
+	LEVEL_UP_MOVE(20, MOVE_SCARYFACE),
+	LEVEL_UP_MOVE(23, MOVE_WAKEUPSLAP),
+	LEVEL_UP_MOVE(27, MOVE_STRENGTH),
+	LEVEL_UP_MOVE(32, MOVE_DUALCHOP),
+	LEVEL_UP_MOVE(37, MOVE_BULKUP),
+	LEVEL_UP_MOVE(41, MOVE_SUBMISSION),
+	LEVEL_UP_MOVE(46, MOVE_SEISMICTOSS),
+	LEVEL_UP_MOVE(51, MOVE_REVENGE),
+	LEVEL_UP_MOVE(56, MOVE_DOUBLEEDGE),
+	LEVEL_UP_MOVE(61, MOVE_CROSSCHOP),
+	LEVEL_UP_MOVE(66, MOVE_DYNAMICPUNCH),
+	LEVEL_UP_MOVE(71, MOVE_CLOSECOMBAT),
 	LEVEL_UP_END
 };
 
@@ -1255,21 +1283,21 @@ static const struct LevelUpMove sMachampLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_LEER),
 	LEVEL_UP_MOVE( 1, MOVE_FOCUSENERGY),
 	LEVEL_UP_MOVE( 1, MOVE_KARATECHOP),
-	LEVEL_UP_MOVE( 3, MOVE_FOCUSENERGY),
-	LEVEL_UP_MOVE( 7, MOVE_KARATECHOP),
-	LEVEL_UP_MOVE( 9, MOVE_FORESIGHT),
-	LEVEL_UP_MOVE(13, MOVE_LOWSWEEP),
-	LEVEL_UP_MOVE(15, MOVE_SEISMICTOSS),
-	LEVEL_UP_MOVE(19, MOVE_REVENGE),
-	LEVEL_UP_MOVE(21, MOVE_KNOCKOFF),
-	LEVEL_UP_MOVE(25, MOVE_VITALTHROW),
-	LEVEL_UP_MOVE(27, MOVE_WAKEUPSLAP),
-	LEVEL_UP_MOVE(33, MOVE_DUALCHOP),
-	LEVEL_UP_MOVE(37, MOVE_SUBMISSION),
-	LEVEL_UP_MOVE(43, MOVE_BULKUP),
-	LEVEL_UP_MOVE(47, MOVE_CROSSCHOP),
-	LEVEL_UP_MOVE(53, MOVE_SCARYFACE),
-	LEVEL_UP_MOVE(57, MOVE_DYNAMICPUNCH),
+	LEVEL_UP_MOVE( 1, MOVE_FORESIGHT),
+	LEVEL_UP_MOVE(12, MOVE_KNOCKOFF),
+	LEVEL_UP_MOVE(16, MOVE_LOWSWEEP),
+	LEVEL_UP_MOVE(20, MOVE_SCARYFACE),
+	LEVEL_UP_MOVE(23, MOVE_WAKEUPSLAP),
+	LEVEL_UP_MOVE(27, MOVE_STRENGTH),
+	LEVEL_UP_MOVE(32, MOVE_DUALCHOP),
+	LEVEL_UP_MOVE(37, MOVE_BULKUP),
+	LEVEL_UP_MOVE(41, MOVE_SUBMISSION),
+	LEVEL_UP_MOVE(46, MOVE_SEISMICTOSS),
+	LEVEL_UP_MOVE(51, MOVE_REVENGE),
+	LEVEL_UP_MOVE(56, MOVE_DOUBLEEDGE),
+	LEVEL_UP_MOVE(61, MOVE_CROSSCHOP),
+	LEVEL_UP_MOVE(66, MOVE_DYNAMICPUNCH),
+	LEVEL_UP_MOVE(71, MOVE_CLOSECOMBAT),
 	LEVEL_UP_END
 };
 
@@ -1300,14 +1328,15 @@ static const struct LevelUpMove sWeepinbellLevelUpLearnset[] = {
 	LEVEL_UP_MOVE(13, MOVE_SLEEPPOWDER),
 	LEVEL_UP_MOVE(15, MOVE_POISONPOWDER),
 	LEVEL_UP_MOVE(17, MOVE_STUNSPORE),
-	LEVEL_UP_MOVE(24, MOVE_ACID),
-	LEVEL_UP_MOVE(29, MOVE_KNOCKOFF),
-	LEVEL_UP_MOVE(32, MOVE_SWEETSCENT),
-	LEVEL_UP_MOVE(39, MOVE_GASTROACID),
-	LEVEL_UP_MOVE(44, MOVE_RAZORLEAF),
-	LEVEL_UP_MOVE(47, MOVE_POISONJAB),
-	LEVEL_UP_MOVE(54, MOVE_SLAM),
-	LEVEL_UP_MOVE(58, MOVE_WRINGOUT),
+	LEVEL_UP_MOVE(21, MOVE_RAZORLEAF),
+	LEVEL_UP_MOVE(26, MOVE_SWEETSCENT),
+	LEVEL_UP_MOVE(30, MOVE_ACIDSPRAY),
+	LEVEL_UP_MOVE(35, MOVE_SLAM),
+	LEVEL_UP_MOVE(40, MOVE_GASTROACID),
+	LEVEL_UP_MOVE(44, MOVE_GRAVAPPLE),
+	LEVEL_UP_MOVE(49, MOVE_POISONJAB),
+	LEVEL_UP_MOVE(54, MOVE_KNOCKOFF),
+	LEVEL_UP_MOVE(59, MOVE_WRINGOUT),
 	LEVEL_UP_END
 };
 
@@ -1318,6 +1347,20 @@ static const struct LevelUpMove sVictreebelLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_SWALLOW),
 	LEVEL_UP_MOVE( 1, MOVE_SPITUP),
 	LEVEL_UP_MOVE( 1, MOVE_VINEWHIP),
+	LEVEL_UP_MOVE( 1, MOVE_GROWTH),
+	LEVEL_UP_MOVE( 1, MOVE_WRAP),
+	LEVEL_UP_MOVE( 1, MOVE_ACID),
+	LEVEL_UP_MOVE( 1, MOVE_POISONPOWDER),
+	LEVEL_UP_MOVE( 1, MOVE_STUNSPORE),
+	LEVEL_UP_MOVE( 1, MOVE_RAZORLEAF),
+	LEVEL_UP_MOVE( 1, MOVE_SWEETSCENT),
+	LEVEL_UP_MOVE( 1, MOVE_GASTROACID),
+	LEVEL_UP_MOVE( 1, MOVE_GRAVAPPLE),
+	LEVEL_UP_MOVE( 1, MOVE_POISONJAB),
+	LEVEL_UP_MOVE( 1, MOVE_KNOCKOFF),
+	LEVEL_UP_MOVE( 1, MOVE_WRINGOUT),
+	LEVEL_UP_MOVE( 1, MOVE_LEAFTORNADO),
+	LEVEL_UP_MOVE( 1, MOVE_ACIDSPRAY),
 	LEVEL_UP_MOVE( 1, MOVE_SLEEPPOWDER),
 	LEVEL_UP_MOVE( 1, MOVE_SWEETSCENT),
 	LEVEL_UP_MOVE( 1, MOVE_RAZORLEAF),
@@ -1527,23 +1570,22 @@ static const struct LevelUpMove sSlowbroLevelUpLearnset[] = {
 
 static const struct LevelUpMove sMagnemiteLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_TACKLE),
-	LEVEL_UP_MOVE( 1, MOVE_SUPERSONIC),
-	LEVEL_UP_MOVE( 5, MOVE_THUNDERSHOCK),
-	LEVEL_UP_MOVE( 7, MOVE_THUNDERWAVE),
+	LEVEL_UP_MOVE( 4, MOVE_SUPERSONIC),
+	LEVEL_UP_MOVE( 8, MOVE_THUNDERWAVE),
 	LEVEL_UP_MOVE(11, MOVE_MAGNETBOMB),
-	LEVEL_UP_MOVE(13, MOVE_LIGHTSCREEN),
+	LEVEL_UP_MOVE(14, MOVE_SPARK),
 	LEVEL_UP_MOVE(17, MOVE_SONICBOOM),
-	LEVEL_UP_MOVE(19, MOVE_SPARK),
-	LEVEL_UP_MOVE(23, MOVE_MIRRORSHOT),
-	LEVEL_UP_MOVE(25, MOVE_METALSOUND),
-	LEVEL_UP_MOVE(29, MOVE_ELECTROBALL),
-	LEVEL_UP_MOVE(31, MOVE_FLASHCANNON),
-	LEVEL_UP_MOVE(35, MOVE_SCREECH),
-	LEVEL_UP_MOVE(37, MOVE_DISCHARGE),
-	LEVEL_UP_MOVE(41, MOVE_LOCKON),
-	LEVEL_UP_MOVE(43, MOVE_MAGNETRISE),
-	LEVEL_UP_MOVE(47, MOVE_GYROBALL),
-	LEVEL_UP_MOVE(49, MOVE_ZAPCANNON),
+	LEVEL_UP_MOVE(20, MOVE_ELECTROBALL),
+	LEVEL_UP_MOVE(24, MOVE_SCREECH),
+	LEVEL_UP_MOVE(27, MOVE_MIRRORSHOT),
+	LEVEL_UP_MOVE(31, MOVE_MAGNETRISE),
+	LEVEL_UP_MOVE(35, MOVE_DISCHARGE),
+	LEVEL_UP_MOVE(39, MOVE_METALSOUND),
+	LEVEL_UP_MOVE(43, MOVE_FLASHCANNON),
+	LEVEL_UP_MOVE(48, MOVE_LIGHTSCREEN),
+	LEVEL_UP_MOVE(52, MOVE_GYROBALL),
+	LEVEL_UP_MOVE(56, MOVE_LOCKON),
+	LEVEL_UP_MOVE(60, MOVE_ZAPCANNON),
 	LEVEL_UP_END
 };
 
@@ -1556,22 +1598,21 @@ static const struct LevelUpMove sMagnetonLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_SUPERSONIC),
 	LEVEL_UP_MOVE( 1, MOVE_THUNDERSHOCK),
 	LEVEL_UP_MOVE( 1, MOVE_THUNDERWAVE),
-	LEVEL_UP_MOVE( 5, MOVE_THUNDERSHOCK),
-	LEVEL_UP_MOVE( 7, MOVE_THUNDERWAVE),
 	LEVEL_UP_MOVE(11, MOVE_MAGNETBOMB),
-	LEVEL_UP_MOVE(13, MOVE_LIGHTSCREEN),
+	LEVEL_UP_MOVE(14, MOVE_SPARK),
 	LEVEL_UP_MOVE(17, MOVE_SONICBOOM),
-	LEVEL_UP_MOVE(19, MOVE_SPARK),
-	LEVEL_UP_MOVE(23, MOVE_MIRRORSHOT),
-	LEVEL_UP_MOVE(25, MOVE_METALSOUND),
-	LEVEL_UP_MOVE(29, MOVE_ELECTROBALL),
-	LEVEL_UP_MOVE(33, MOVE_FLASHCANNON),
-	LEVEL_UP_MOVE(39, MOVE_SCREECH),
-	LEVEL_UP_MOVE(43, MOVE_DISCHARGE),
-	LEVEL_UP_MOVE(49, MOVE_LOCKON),
-	LEVEL_UP_MOVE(53, MOVE_MAGNETRISE),
-	LEVEL_UP_MOVE(59, MOVE_GYROBALL),
-	LEVEL_UP_MOVE(63, MOVE_ZAPCANNON),
+	LEVEL_UP_MOVE(20, MOVE_ELECTROBALL),
+	LEVEL_UP_MOVE(24, MOVE_SCREECH),
+	LEVEL_UP_MOVE(27, MOVE_MIRRORSHOT),
+	LEVEL_UP_MOVE(29, MOVE_TRIATTACK),
+	LEVEL_UP_MOVE(34, MOVE_MAGNETRISE),
+	LEVEL_UP_MOVE(39, MOVE_DISCHARGE),
+	LEVEL_UP_MOVE(44, MOVE_METALSOUND),
+	LEVEL_UP_MOVE(48, MOVE_FLASHCANNON),
+	LEVEL_UP_MOVE(53, MOVE_LIGHTSCREEN),
+	LEVEL_UP_MOVE(57, MOVE_GYROBALL),
+	LEVEL_UP_MOVE(62, MOVE_LOCKON),
+	LEVEL_UP_MOVE(66, MOVE_ZAPCANNON),
 	LEVEL_UP_END
 };
 
@@ -1836,24 +1877,21 @@ static const struct LevelUpMove sOnixLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_TACKLE),
 	LEVEL_UP_MOVE( 1, MOVE_HARDEN),
 	LEVEL_UP_MOVE( 1, MOVE_BIND),
-	LEVEL_UP_MOVE( 4, MOVE_CURSE),
-	LEVEL_UP_MOVE( 7, MOVE_ROCKTHROW),
-	LEVEL_UP_MOVE(10, MOVE_ROCKTOMB),
-	LEVEL_UP_MOVE(13, MOVE_RAGE),
-	LEVEL_UP_MOVE(16, MOVE_STEALTHROCK),
-	LEVEL_UP_MOVE(19, MOVE_ROCKPOLISH),
-	LEVEL_UP_MOVE(20, MOVE_GYROBALL),
-	LEVEL_UP_MOVE(22, MOVE_SMACKDOWN),
-	LEVEL_UP_MOVE(25, MOVE_DRAGONBREATH),
-	LEVEL_UP_MOVE(28, MOVE_SLAM),
-	LEVEL_UP_MOVE(31, MOVE_SCREECH),
-	LEVEL_UP_MOVE(34, MOVE_ROCKSLIDE),
-	LEVEL_UP_MOVE(37, MOVE_SANDTOMB),
-	LEVEL_UP_MOVE(40, MOVE_IRONTAIL),
-	LEVEL_UP_MOVE(43, MOVE_DIG),
-	LEVEL_UP_MOVE(46, MOVE_STONEEDGE),
-	LEVEL_UP_MOVE(49, MOVE_DOUBLEEDGE),
-	LEVEL_UP_MOVE(52, MOVE_SANDSTORM),
+	LEVEL_UP_MOVE( 4, MOVE_SMACKDOWN),
+	LEVEL_UP_MOVE( 8, MOVE_ROCKPOLISH),
+	LEVEL_UP_MOVE(12, MOVE_DRAGONBREATH),
+	LEVEL_UP_MOVE(16, MOVE_CURSE),
+	LEVEL_UP_MOVE(20, MOVE_ROCKSLIDE),
+	LEVEL_UP_MOVE(24, MOVE_SCREECH),
+	LEVEL_UP_MOVE(28, MOVE_SANDTOMB),
+	LEVEL_UP_MOVE(32, MOVE_STEALTHROCK),
+	LEVEL_UP_MOVE(36, MOVE_SLAM),
+	LEVEL_UP_MOVE(40, MOVE_SANDSTORM),
+	LEVEL_UP_MOVE(44, MOVE_DIG),
+	LEVEL_UP_MOVE(48, MOVE_IRONTAIL),
+	LEVEL_UP_MOVE(52, MOVE_STONEEDGE),
+	LEVEL_UP_MOVE(56, MOVE_DOUBLEEDGE),
+	LEVEL_UP_MOVE(60, MOVE_EARTHQUAKE),
 	LEVEL_UP_END
 };
 
@@ -2045,25 +2083,25 @@ static const struct LevelUpMove sCuboneLevelUpLearnset[] = {
 };
 
 static const struct LevelUpMove sMarowakLevelUpLearnset[] = {
+	LEVEL_UP_MOVE( 1, MOVE_DOUBLEEDGE),
+	LEVEL_UP_MOVE( 1, MOVE_SHADOWBONE),
+	LEVEL_UP_MOVE( 1, MOVE_RAGE),
+	LEVEL_UP_MOVE( 1, MOVE_MUDSLAP),
 	LEVEL_UP_MOVE( 1, MOVE_GROWL),
 	LEVEL_UP_MOVE( 1, MOVE_TAILWHIP),
-	LEVEL_UP_MOVE( 1, MOVE_BONECLUB),
-	LEVEL_UP_MOVE( 1, MOVE_HEADBUTT),
-	LEVEL_UP_MOVE( 3, MOVE_TAILWHIP),
 	LEVEL_UP_MOVE( 7, MOVE_BONECLUB),
-	LEVEL_UP_MOVE(11, MOVE_HEADBUTT),
-	LEVEL_UP_MOVE(13, MOVE_LEER),
-	LEVEL_UP_MOVE(17, MOVE_FOCUSENERGY),
-	LEVEL_UP_MOVE(21, MOVE_BONEMERANG),
-	LEVEL_UP_MOVE(23, MOVE_RAGE),
-	LEVEL_UP_MOVE(27, MOVE_FALSESWIPE),
-	LEVEL_UP_MOVE(33, MOVE_THRASH),
-	LEVEL_UP_MOVE(37, MOVE_FLING),
-	LEVEL_UP_MOVE(43, MOVE_STOMPINGTANTRUM),
-	LEVEL_UP_MOVE(49, MOVE_ENDEAVOR),
-	LEVEL_UP_MOVE(53, MOVE_DOUBLEEDGE),
-	LEVEL_UP_MOVE(59, MOVE_RETALIATE),
-	LEVEL_UP_MOVE(65, MOVE_BONERUSH),
+	LEVEL_UP_MOVE(10, MOVE_LEER),
+	LEVEL_UP_MOVE(13, MOVE_FALSESWIPE),
+	LEVEL_UP_MOVE(16, MOVE_HEADBUTT),
+	LEVEL_UP_MOVE(19, MOVE_RETALIATE),
+	LEVEL_UP_MOVE(22, MOVE_FLING),
+	LEVEL_UP_MOVE(25, MOVE_STOMPINGTANTRUM),
+	LEVEL_UP_MOVE(31, MOVE_BONERUSH),
+	LEVEL_UP_MOVE(36, MOVE_FOCUSENERGY),
+	LEVEL_UP_MOVE(42, MOVE_ENDEAVOR),
+	LEVEL_UP_MOVE(48, MOVE_BONEMERANG),
+	LEVEL_UP_MOVE(54, MOVE_THRASH),
+	LEVEL_UP_MOVE(60, MOVE_HEADSMASH),
 	LEVEL_UP_END
 };
 
@@ -2076,22 +2114,20 @@ static const struct LevelUpMove sHitmonleeLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_REVENGE),
 	LEVEL_UP_MOVE( 1, MOVE_MEDITATE),
 	LEVEL_UP_MOVE( 1, MOVE_ROLLINGKICK),
-	LEVEL_UP_MOVE( 1, MOVE_JUMPKICK),
-	LEVEL_UP_MOVE( 5, MOVE_MEDITATE),
-	LEVEL_UP_MOVE( 9, MOVE_ROLLINGKICK),
-	LEVEL_UP_MOVE(13, MOVE_JUMPKICK),
-	LEVEL_UP_MOVE(17, MOVE_BRICKBREAK),
-	LEVEL_UP_MOVE(21, MOVE_FOCUSENERGY),
-	LEVEL_UP_MOVE(25, MOVE_FEINT),
-	LEVEL_UP_MOVE(29, MOVE_HIGHJUMPKICK),
-	LEVEL_UP_MOVE(33, MOVE_MINDREADER),
-	LEVEL_UP_MOVE(37, MOVE_FORESIGHT),
-	LEVEL_UP_MOVE(41, MOVE_WIDEGUARD),
-	LEVEL_UP_MOVE(45, MOVE_BLAZEKICK),
-	LEVEL_UP_MOVE(49, MOVE_ENDURE),
-	LEVEL_UP_MOVE(53, MOVE_MEGAKICK),
-	LEVEL_UP_MOVE(57, MOVE_CLOSECOMBAT),
-	LEVEL_UP_MOVE(61, MOVE_REVERSAL),
+	LEVEL_UP_MOVE( 4, MOVE_DOUBLEKICK),
+	LEVEL_UP_MOVE( 8, MOVE_LOWKICK),
+	LEVEL_UP_MOVE(12, MOVE_ENDURE),
+	LEVEL_UP_MOVE(16, MOVE_REVENGE),
+	LEVEL_UP_MOVE(19, MOVE_BRICKBREAK),
+	LEVEL_UP_MOVE(21, MOVE_WIDEGUARD),
+	LEVEL_UP_MOVE(25, MOVE_BLAZEKICK),
+	LEVEL_UP_MOVE(30, MOVE_MINDREADER),
+	LEVEL_UP_MOVE(34, MOVE_MEGAKICK),
+	LEVEL_UP_MOVE(39, MOVE_JUMPKICK),
+	LEVEL_UP_MOVE(44, MOVE_REVERSAL),
+	LEVEL_UP_MOVE(49, MOVE_THUNDEROUSKICK),
+	LEVEL_UP_MOVE(54, MOVE_HIGHJUMPKICK),
+	LEVEL_UP_MOVE(59, MOVE_CLOSECOMBAT),
 	LEVEL_UP_END
 };
 
@@ -2164,7 +2200,8 @@ static const struct LevelUpMove sKoffingLevelUpLearnset[] = {
 
 static const struct LevelUpMove sWeezingLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 0, MOVE_DOUBLEHIT),
-	LEVEL_UP_MOVE( 1, MOVE_DOUBLEHIT),
+	LEVEL_UP_MOVE( 1, MOVE_HEATWAVE),
+	LEVEL_UP_MOVE( 1, MOVE_STRANGESTEAM),
 	LEVEL_UP_MOVE( 1, MOVE_POISONGAS),
 	LEVEL_UP_MOVE( 1, MOVE_TACKLE),
 	LEVEL_UP_MOVE( 1, MOVE_SMOG),
@@ -2402,6 +2439,8 @@ static const struct LevelUpMove sStarmieLevelUpLearnset[] = {
 };
 
 static const struct LevelUpMove sMrMimeLevelUpLearnset[] = {
+	LEVEL_UP_MOVE( 0, MOVE_BARRIER),
+	LEVEL_UP_MOVE( 1, MOVE_PSYCHICTERRAIN),
 	LEVEL_UP_MOVE( 1, MOVE_MISTYTERRAIN),
 	LEVEL_UP_MOVE( 1, MOVE_MAGICALLEAF),
 	LEVEL_UP_MOVE( 1, MOVE_QUICKGUARD),
@@ -2535,21 +2574,23 @@ static const struct LevelUpMove sPinsirLevelUpLearnset[] = {
 };
 
 static const struct LevelUpMove sTaurosLevelUpLearnset[] = {
-	LEVEL_UP_MOVE( 1, MOVE_TACKLE),
-	LEVEL_UP_MOVE( 3, MOVE_TAILWHIP),
-	LEVEL_UP_MOVE( 5, MOVE_RAGE),
-	LEVEL_UP_MOVE( 8, MOVE_HORNATTACK),
-	LEVEL_UP_MOVE(11, MOVE_SCARYFACE),
-	LEVEL_UP_MOVE(15, MOVE_PURSUIT),
-	LEVEL_UP_MOVE(19, MOVE_REST),
-	LEVEL_UP_MOVE(24, MOVE_PAYBACK),
-	LEVEL_UP_MOVE(29, MOVE_WORKUP),
-	LEVEL_UP_MOVE(35, MOVE_TAKEDOWN),
-	LEVEL_UP_MOVE(41, MOVE_ZENHEADBUTT),
-	LEVEL_UP_MOVE(48, MOVE_SWAGGER),
-	LEVEL_UP_MOVE(55, MOVE_THRASH),
-	LEVEL_UP_MOVE(63, MOVE_DOUBLEEDGE),
-	LEVEL_UP_MOVE(71, MOVE_GIGAIMPACT),
+	LEVEL_UP_MOVE( 1, MOVE_RAGE),
+	LEVEL_UP_MOVE( 1, MOVE_TAILWHIP),
+	LEVEL_UP_MOVE( 4, MOVE_TACKLE),
+	LEVEL_UP_MOVE( 8, MOVE_WORKUP),
+	LEVEL_UP_MOVE(12, MOVE_PURSUIT),
+	LEVEL_UP_MOVE(16, MOVE_HORNATTACK),
+	LEVEL_UP_MOVE(20, MOVE_PAYBACK),
+	LEVEL_UP_MOVE(24, MOVE_SCARYFACE),
+	LEVEL_UP_MOVE(28, MOVE_ASSURANCE),
+	LEVEL_UP_MOVE(32, MOVE_ZENHEADBUTT),
+	LEVEL_UP_MOVE(37, MOVE_TAKEDOWN),
+	LEVEL_UP_MOVE(42, MOVE_REST),
+	LEVEL_UP_MOVE(47, MOVE_SWAGGER),
+	LEVEL_UP_MOVE(52, MOVE_THRASH),
+	LEVEL_UP_MOVE(58, MOVE_HEADCHARGE),
+	LEVEL_UP_MOVE(64, MOVE_HEADSMASH),
+	LEVEL_UP_MOVE(70, MOVE_GIGAIMPACT),
 	LEVEL_UP_END
 };
 
@@ -2671,16 +2712,17 @@ static const struct LevelUpMove sFlareonLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_TACKLE),
 	LEVEL_UP_MOVE( 1, MOVE_TAILWHIP),
 	LEVEL_UP_MOVE( 5, MOVE_SANDATTACK),
-	LEVEL_UP_MOVE( 9, MOVE_BABYDOLLEYES),
-	LEVEL_UP_MOVE(13, MOVE_QUICKATTACK),
-	LEVEL_UP_MOVE(17, MOVE_BITE),
-	LEVEL_UP_MOVE(20, MOVE_FIREFANG),
-	LEVEL_UP_MOVE(25, MOVE_FIRESPIN),
-	LEVEL_UP_MOVE(29, MOVE_SCARYFACE),
-	LEVEL_UP_MOVE(33, MOVE_SMOG),
-	LEVEL_UP_MOVE(37, MOVE_LAVAPLUME),
-	LEVEL_UP_MOVE(41, MOVE_LASTRESORT),
-	LEVEL_UP_MOVE(45, MOVE_FLAREBLITZ),
+	LEVEL_UP_MOVE(10, MOVE_QUICKATTACK),
+	LEVEL_UP_MOVE(15, MOVE_BABYDOLLEYES),
+	LEVEL_UP_MOVE(20, MOVE_SMOG),
+	LEVEL_UP_MOVE(25, MOVE_BITE),
+	LEVEL_UP_MOVE(30, MOVE_FIREFANG),
+	LEVEL_UP_MOVE(35, MOVE_FIRESPIN),
+	LEVEL_UP_MOVE(40, MOVE_LAVAPLUME),
+	LEVEL_UP_MOVE(45, MOVE_SCARYFACE),
+	LEVEL_UP_MOVE(50, MOVE_SACREDFIRE),
+	LEVEL_UP_MOVE(55, MOVE_LASTRESORT),
+	LEVEL_UP_MOVE(60, MOVE_FLAREBLITZ),
 	LEVEL_UP_END
 };
 
@@ -2866,22 +2908,25 @@ static const struct LevelUpMove sZapdosLevelUpLearnset[] = {
 };
 
 static const struct LevelUpMove sMoltresLevelUpLearnset[] = {
-	LEVEL_UP_MOVE( 1, MOVE_WINGATTACK),
-	LEVEL_UP_MOVE( 1, MOVE_EMBER),
-	LEVEL_UP_MOVE( 8, MOVE_FIRESPIN),
-	LEVEL_UP_MOVE(15, MOVE_AGILITY),
-	LEVEL_UP_MOVE(22, MOVE_ENDURE),
-	LEVEL_UP_MOVE(29, MOVE_ANCIENTPOWER),
-	LEVEL_UP_MOVE(36, MOVE_FLAMETHROWER),
-	LEVEL_UP_MOVE(43, MOVE_SAFEGUARD),
-	LEVEL_UP_MOVE(50, MOVE_AIRSLASH),
-	LEVEL_UP_MOVE(57, MOVE_SUNNYDAY),
-	LEVEL_UP_MOVE(64, MOVE_HEATWAVE),
-	LEVEL_UP_MOVE(71, MOVE_SOLARBEAM),
-	LEVEL_UP_MOVE(78, MOVE_SKYATTACK),
-	LEVEL_UP_MOVE(85, MOVE_ROOST),
-	LEVEL_UP_MOVE(92, MOVE_HURRICANE),
-	LEVEL_UP_MOVE(99, MOVE_BURNUP),
+	LEVEL_UP_MOVE( 1, MOVE_FIRESPIN),
+	LEVEL_UP_MOVE( 1, MOVE_GUST),
+	LEVEL_UP_MOVE( 1, MOVE_LEER),
+	LEVEL_UP_MOVE( 5, MOVE_EMBER),
+	LEVEL_UP_MOVE(10, MOVE_SAFEGUARD),
+	LEVEL_UP_MOVE(15, MOVE_WINGATTACK),
+	LEVEL_UP_MOVE(20, MOVE_AGILITY),
+	LEVEL_UP_MOVE(25, MOVE_ANCIENTPOWER),
+	LEVEL_UP_MOVE(30, MOVE_INCINERATE),
+	LEVEL_UP_MOVE(35, MOVE_AIRSLASH),
+	LEVEL_UP_MOVE(40, MOVE_ROOST),
+	LEVEL_UP_MOVE(45, MOVE_HEATWAVE),
+	LEVEL_UP_MOVE(50, MOVE_SUNNYDAY),
+	LEVEL_UP_MOVE(55, MOVE_HURRICANE),
+	LEVEL_UP_MOVE(60, MOVE_ENDURE),
+	LEVEL_UP_MOVE(65, MOVE_BURNUP),
+	LEVEL_UP_MOVE(70, MOVE_SOLARBEAM),
+	LEVEL_UP_MOVE(75, MOVE_AEROBLAST),
+	LEVEL_UP_MOVE(80, MOVE_SKYATTACK),
 	LEVEL_UP_END
 };
 
@@ -2975,6 +3020,9 @@ static const struct LevelUpMove sMewtwoLevelUpLearnset[] = {
 };
 
 static const struct LevelUpMove sMewLevelUpLearnset[] = {
+	LEVEL_UP_MOVE( 1, MOVE_TELEPORT),
+	LEVEL_UP_MOVE( 1, MOVE_SOFTBOILED),
+	LEVEL_UP_MOVE( 1, MOVE_FAKEOUT),
 	LEVEL_UP_MOVE( 1, MOVE_POUND),
 	LEVEL_UP_MOVE( 1, MOVE_REFLECTTYPE),
 	LEVEL_UP_MOVE( 1, MOVE_TRANSFORM),
@@ -3468,25 +3516,28 @@ static const struct LevelUpMove sIgglybuffLevelUpLearnset[] = {
 
 static const struct LevelUpMove sTogepiLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_GROWL),
-	LEVEL_UP_MOVE( 1, MOVE_CHARM),
-	LEVEL_UP_MOVE( 5, MOVE_METRONOME),
-	LEVEL_UP_MOVE( 9, MOVE_SWEETKISS),
-	LEVEL_UP_MOVE(13, MOVE_YAWN),
-	LEVEL_UP_MOVE(17, MOVE_ENCORE),
-	LEVEL_UP_MOVE(21, MOVE_FOLLOWME),
-	LEVEL_UP_MOVE(25, MOVE_BESTOW),
-	LEVEL_UP_MOVE(29, MOVE_WISH),
-	LEVEL_UP_MOVE(33, MOVE_ANCIENTPOWER),
-	LEVEL_UP_MOVE(37, MOVE_SAFEGUARD),
-	LEVEL_UP_MOVE(41, MOVE_BATONPASS),
-	LEVEL_UP_MOVE(45, MOVE_DOUBLEEDGE),
-	LEVEL_UP_MOVE(49, MOVE_LASTRESORT),
-	LEVEL_UP_MOVE(53, MOVE_AFTERYOU),
+	LEVEL_UP_MOVE( 1, MOVE_POUND),
+	LEVEL_UP_MOVE( 4, MOVE_SWEETKISS),
+	LEVEL_UP_MOVE( 8, MOVE_LIFEDEW),
+	LEVEL_UP_MOVE(12, MOVE_CHARM),
+	LEVEL_UP_MOVE(14, MOVE_ENCORE),
+	LEVEL_UP_MOVE(16, MOVE_ANCIENTPOWER),
+	LEVEL_UP_MOVE(20, MOVE_YAWN),
+	LEVEL_UP_MOVE(22, MOVE_BESTOW),
+	LEVEL_UP_MOVE(24, MOVE_METRONOME),
+	LEVEL_UP_MOVE(28, MOVE_AFTERYOU),
+	LEVEL_UP_MOVE(32, MOVE_DOUBLEEDGE),
+	LEVEL_UP_MOVE(36, MOVE_SAFEGUARD),
+	LEVEL_UP_MOVE(40, MOVE_FOLLOWME),
+	LEVEL_UP_MOVE(44, MOVE_BATONPASS),
+	LEVEL_UP_MOVE(48, MOVE_LASTRESORT),
+	LEVEL_UP_MOVE(52, MOVE_WISH),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sTogeticLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_MAGICALLEAF),
+	LEVEL_UP_MOVE( 1, MOVE_MYSTICALFIRE),
 	LEVEL_UP_MOVE( 1, MOVE_GROWL),
 	LEVEL_UP_MOVE( 1, MOVE_CHARM),
 	LEVEL_UP_MOVE( 1, MOVE_METRONOME),
@@ -3558,17 +3609,17 @@ static const struct LevelUpMove sMareepLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_GROWL),
 	LEVEL_UP_MOVE( 4, MOVE_THUNDERWAVE),
 	LEVEL_UP_MOVE( 8, MOVE_THUNDERSHOCK),
-	LEVEL_UP_MOVE(11, MOVE_COTTONSPORE),
+	LEVEL_UP_MOVE(12, MOVE_COTTONSPORE),
 	LEVEL_UP_MOVE(15, MOVE_CHARGE),
 	LEVEL_UP_MOVE(18, MOVE_TAKEDOWN),
 	LEVEL_UP_MOVE(22, MOVE_ELECTROBALL),
-	LEVEL_UP_MOVE(25, MOVE_CONFUSERAY),
+	LEVEL_UP_MOVE(26, MOVE_CONFUSERAY),
 	LEVEL_UP_MOVE(29, MOVE_POWERGEM),
-	LEVEL_UP_MOVE(32, MOVE_DISCHARGE),
-	LEVEL_UP_MOVE(36, MOVE_COTTONGUARD),
-	LEVEL_UP_MOVE(39, MOVE_SIGNALBEAM),
-	LEVEL_UP_MOVE(43, MOVE_LIGHTSCREEN),
-	LEVEL_UP_MOVE(46, MOVE_THUNDER),
+	LEVEL_UP_MOVE(33, MOVE_DISCHARGE),
+	LEVEL_UP_MOVE(37, MOVE_COTTONGUARD),
+	LEVEL_UP_MOVE(40, MOVE_SIGNALBEAM),
+	LEVEL_UP_MOVE(44, MOVE_LIGHTSCREEN),
+	LEVEL_UP_MOVE(47, MOVE_THUNDERCAGE),
 	LEVEL_UP_END
 };
 
@@ -3577,19 +3628,17 @@ static const struct LevelUpMove sFlaaffyLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_GROWL),
 	LEVEL_UP_MOVE( 1, MOVE_THUNDERWAVE),
 	LEVEL_UP_MOVE( 1, MOVE_THUNDERSHOCK),
-	LEVEL_UP_MOVE( 4, MOVE_THUNDERWAVE),
-	LEVEL_UP_MOVE( 8, MOVE_THUNDERSHOCK),
-	LEVEL_UP_MOVE(11, MOVE_COTTONSPORE),
-	LEVEL_UP_MOVE(16, MOVE_CHARGE),
-	LEVEL_UP_MOVE(20, MOVE_TAKEDOWN),
-	LEVEL_UP_MOVE(25, MOVE_ELECTROBALL),
+	LEVEL_UP_MOVE(12, MOVE_COTTONSPORE),
+	LEVEL_UP_MOVE(15, MOVE_CHARGE),
+	LEVEL_UP_MOVE(19, MOVE_TAKEDOWN),
+	LEVEL_UP_MOVE(24, MOVE_ELECTROBALL),
 	LEVEL_UP_MOVE(29, MOVE_CONFUSERAY),
-	LEVEL_UP_MOVE(34, MOVE_POWERGEM),
+	LEVEL_UP_MOVE(33, MOVE_POWERGEM),
 	LEVEL_UP_MOVE(38, MOVE_DISCHARGE),
 	LEVEL_UP_MOVE(43, MOVE_COTTONGUARD),
 	LEVEL_UP_MOVE(47, MOVE_SIGNALBEAM),
 	LEVEL_UP_MOVE(52, MOVE_LIGHTSCREEN),
-	LEVEL_UP_MOVE(56, MOVE_THUNDER),
+	LEVEL_UP_MOVE(57, MOVE_THUNDERCAGE),
 	LEVEL_UP_END
 };
 
@@ -3599,26 +3648,23 @@ static const struct LevelUpMove sAmpharosLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_ZAPCANNON),
 	LEVEL_UP_MOVE( 1, MOVE_MAGNETICFLUX),
 	LEVEL_UP_MOVE( 1, MOVE_IONDELUGE),
-	LEVEL_UP_MOVE( 1, MOVE_DRAGONPULSE),
 	LEVEL_UP_MOVE( 1, MOVE_FIREPUNCH),
+	LEVEL_UP_MOVE( 1, MOVE_DRAGONPULSE),
 	LEVEL_UP_MOVE( 1, MOVE_TACKLE),
 	LEVEL_UP_MOVE( 1, MOVE_GROWL),
 	LEVEL_UP_MOVE( 1, MOVE_THUNDERWAVE),
 	LEVEL_UP_MOVE( 1, MOVE_THUNDERSHOCK),
-	LEVEL_UP_MOVE( 4, MOVE_THUNDERWAVE),
-	LEVEL_UP_MOVE( 8, MOVE_THUNDERSHOCK),
-	LEVEL_UP_MOVE(11, MOVE_COTTONSPORE),
-	LEVEL_UP_MOVE(16, MOVE_CHARGE),
-	LEVEL_UP_MOVE(20, MOVE_TAKEDOWN),
-	LEVEL_UP_MOVE(25, MOVE_ELECTROBALL),
+	LEVEL_UP_MOVE(12, MOVE_COTTONSPORE),
+	LEVEL_UP_MOVE(15, MOVE_CHARGE),
+	LEVEL_UP_MOVE(19, MOVE_TAKEDOWN),
+	LEVEL_UP_MOVE(24, MOVE_ELECTROBALL),
 	LEVEL_UP_MOVE(29, MOVE_CONFUSERAY),
 	LEVEL_UP_MOVE(35, MOVE_POWERGEM),
-	LEVEL_UP_MOVE(40, MOVE_DISCHARGE),
-	LEVEL_UP_MOVE(46, MOVE_COTTONGUARD),
-	LEVEL_UP_MOVE(51, MOVE_SIGNALBEAM),
-	LEVEL_UP_MOVE(57, MOVE_LIGHTSCREEN),
-	LEVEL_UP_MOVE(62, MOVE_THUNDER),
-	LEVEL_UP_MOVE(65, MOVE_DRAGONPULSE),
+	LEVEL_UP_MOVE(41, MOVE_DISCHARGE),
+	LEVEL_UP_MOVE(47, MOVE_COTTONGUARD),
+	LEVEL_UP_MOVE(52, MOVE_SIGNALBEAM),
+	LEVEL_UP_MOVE(58, MOVE_LIGHTSCREEN),
+	LEVEL_UP_MOVE(63, MOVE_THUNDERCAGE),
 	LEVEL_UP_END
 };
 
@@ -3627,6 +3673,15 @@ static const struct LevelUpMove sBellossomLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_MAGICALLEAF),
 	LEVEL_UP_MOVE( 1, MOVE_LEAFSTORM),
 	LEVEL_UP_MOVE( 1, MOVE_LEAFBLADE),
+	LEVEL_UP_MOVE( 1, MOVE_FLORALHEALING),
+	LEVEL_UP_MOVE( 1, MOVE_FIERYDANCE),
+	LEVEL_UP_MOVE( 1, MOVE_LUNARDANCE),
+	LEVEL_UP_MOVE( 1, MOVE_MAGICALLEAF),
+	LEVEL_UP_MOVE( 1, MOVE_QUIVERDANCE),
+	LEVEL_UP_MOVE( 1, MOVE_ABSORB),
+	LEVEL_UP_MOVE( 1, MOVE_GROWTH),
+	LEVEL_UP_MOVE( 1, MOVE_ACID),
+	LEVEL_UP_MOVE( 1, MOVE_SWEETSCENT),
 	LEVEL_UP_MOVE( 1, MOVE_MEGADRAIN),
 	LEVEL_UP_MOVE( 1, MOVE_SWEETSCENT),
 	LEVEL_UP_MOVE( 1, MOVE_STUNSPORE),
@@ -3865,12 +3920,13 @@ static const struct LevelUpMove sYanmaLevelUpLearnset[] = {
 	LEVEL_UP_MOVE(27, MOVE_UPROAR),
 	LEVEL_UP_MOVE(30, MOVE_PURSUIT),
 	LEVEL_UP_MOVE(33, MOVE_ANCIENTPOWER),
-	LEVEL_UP_MOVE(38, MOVE_HYPNOSIS),
-	LEVEL_UP_MOVE(43, MOVE_WINGATTACK),
-	LEVEL_UP_MOVE(46, MOVE_SCREECH),
-	LEVEL_UP_MOVE(49, MOVE_UTURN),
-	LEVEL_UP_MOVE(54, MOVE_AIRSLASH),
-	LEVEL_UP_MOVE(57, MOVE_BUGBUZZ),
+	LEVEL_UP_MOVE(37, MOVE_SILVERWIND),
+	LEVEL_UP_MOVE(41, MOVE_SCREECH),
+	LEVEL_UP_MOVE(45, MOVE_HYPNOSIS),
+	LEVEL_UP_MOVE(49, MOVE_UPROAR),
+	LEVEL_UP_MOVE(53, MOVE_AIRSLASH),
+	LEVEL_UP_MOVE(57, MOVE_UTURN),
+	LEVEL_UP_MOVE(63, MOVE_BUGBUZZ),
 	LEVEL_UP_END
 };
 
@@ -3956,15 +4012,16 @@ static const struct LevelUpMove sMurkrowLevelUpLearnset[] = {
 	LEVEL_UP_MOVE(11, MOVE_HAZE),
 	LEVEL_UP_MOVE(15, MOVE_WINGATTACK),
 	LEVEL_UP_MOVE(21, MOVE_NIGHTSHADE),
-	LEVEL_UP_MOVE(25, MOVE_ASSURANCE),
-	LEVEL_UP_MOVE(31, MOVE_TAUNT),
-	LEVEL_UP_MOVE(35, MOVE_FEINTATTACK),
-	LEVEL_UP_MOVE(41, MOVE_MEANLOOK),
-	LEVEL_UP_MOVE(45, MOVE_FOULPLAY),
-	LEVEL_UP_MOVE(50, MOVE_TAILWIND),
-	LEVEL_UP_MOVE(55, MOVE_SUCKERPUNCH),
-	LEVEL_UP_MOVE(61, MOVE_TORMENT),
-	LEVEL_UP_MOVE(65, MOVE_QUASH),
+	LEVEL_UP_MOVE(25, MOVE_FEINTATTACK),
+	LEVEL_UP_MOVE(30, MOVE_TAUNT),
+	LEVEL_UP_MOVE(34, MOVE_DUALWINGBEAT),
+	LEVEL_UP_MOVE(39, MOVE_ASSURANCE),
+	LEVEL_UP_MOVE(44, MOVE_MEANLOOK),
+	LEVEL_UP_MOVE(48, MOVE_SUCKERPUNCH),
+	LEVEL_UP_MOVE(53, MOVE_TAILWIND),
+	LEVEL_UP_MOVE(57, MOVE_FOULPLAY),
+	LEVEL_UP_MOVE(62, MOVE_OBLIVIONWING),
+	LEVEL_UP_MOVE(66, MOVE_QUASH),
 	LEVEL_UP_END
 };
 
@@ -4145,24 +4202,22 @@ static const struct LevelUpMove sSteelixLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_TACKLE),
 	LEVEL_UP_MOVE( 1, MOVE_HARDEN),
 	LEVEL_UP_MOVE( 1, MOVE_BIND),
-	LEVEL_UP_MOVE( 4, MOVE_CURSE),
-	LEVEL_UP_MOVE( 7, MOVE_ROCKTHROW),
-	LEVEL_UP_MOVE(10, MOVE_ROCKTOMB),
-	LEVEL_UP_MOVE(13, MOVE_RAGE),
-	LEVEL_UP_MOVE(16, MOVE_STEALTHROCK),
-	LEVEL_UP_MOVE(19, MOVE_AUTOTOMIZE),
-	LEVEL_UP_MOVE(20, MOVE_GYROBALL),
-	LEVEL_UP_MOVE(22, MOVE_SMACKDOWN),
-	LEVEL_UP_MOVE(25, MOVE_DRAGONBREATH),
-	LEVEL_UP_MOVE(28, MOVE_SLAM),
-	LEVEL_UP_MOVE(31, MOVE_SCREECH),
-	LEVEL_UP_MOVE(34, MOVE_ROCKSLIDE),
-	LEVEL_UP_MOVE(37, MOVE_CRUNCH),
-	LEVEL_UP_MOVE(40, MOVE_IRONTAIL),
-	LEVEL_UP_MOVE(43, MOVE_DIG),
-	LEVEL_UP_MOVE(46, MOVE_STONEEDGE),
-	LEVEL_UP_MOVE(49, MOVE_DOUBLEEDGE),
-	LEVEL_UP_MOVE(52, MOVE_SANDSTORM),
+	LEVEL_UP_MOVE( 4, MOVE_SMACKDOWN),
+	LEVEL_UP_MOVE( 8, MOVE_AUTOTOMIZE),
+	LEVEL_UP_MOVE(12, MOVE_DRAGONBREATH),
+	LEVEL_UP_MOVE(16, MOVE_CURSE),
+	LEVEL_UP_MOVE(20, MOVE_ROCKSLIDE),
+	LEVEL_UP_MOVE(24, MOVE_SCREECH),
+	LEVEL_UP_MOVE(28, MOVE_SANDTOMB),
+	LEVEL_UP_MOVE(32, MOVE_STEALTHROCK),
+	LEVEL_UP_MOVE(36, MOVE_SLAM),
+	LEVEL_UP_MOVE(40, MOVE_SANDSTORM),
+	LEVEL_UP_MOVE(44, MOVE_DIG),
+	LEVEL_UP_MOVE(48, MOVE_IRONTAIL),
+	LEVEL_UP_MOVE(52, MOVE_STONEEDGE),
+	LEVEL_UP_MOVE(56, MOVE_DOUBLEEDGE),
+	LEVEL_UP_MOVE(60, MOVE_EARTHQUAKE),
+	LEVEL_UP_MOVE(64, MOVE_MAGNETRISE),
 	LEVEL_UP_END
 };
 
@@ -4343,8 +4398,10 @@ static const struct LevelUpMove sTeddiursaLevelUpLearnset[] = {
 };
 
 static const struct LevelUpMove sUrsaringLevelUpLearnset[] = {
-	LEVEL_UP_MOVE( 1, MOVE_HAMMERARM),
-	LEVEL_UP_MOVE( 1, MOVE_COVET),
+	LEVEL_UP_MOVE( 1, MOVE_CRUSHGRIP),
+	LEVEL_UP_MOVE( 1, MOVE_FLING),
+	LEVEL_UP_MOVE( 1, MOVE_BABYDOLLEYES),
+	LEVEL_UP_MOVE( 1, MOVE_CHARM),
 	LEVEL_UP_MOVE( 1, MOVE_SCRATCH),
 	LEVEL_UP_MOVE( 1, MOVE_LEER),
 	LEVEL_UP_MOVE( 1, MOVE_LICK),
@@ -4369,16 +4426,18 @@ static const struct LevelUpMove sSlugmaLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 8, MOVE_ROCKTHROW),
 	LEVEL_UP_MOVE(13, MOVE_HARDEN),
 	LEVEL_UP_MOVE(15, MOVE_INCINERATE),
-	LEVEL_UP_MOVE(20, MOVE_CLEARSMOG),
-	LEVEL_UP_MOVE(22, MOVE_ANCIENTPOWER),
-	LEVEL_UP_MOVE(27, MOVE_FLAMEBURST),
-	LEVEL_UP_MOVE(29, MOVE_ROCKSLIDE),
-	LEVEL_UP_MOVE(34, MOVE_LAVAPLUME),
+	LEVEL_UP_MOVE(18, MOVE_CLEARSMOG),
+	LEVEL_UP_MOVE(21, MOVE_ANCIENTPOWER),
+	LEVEL_UP_MOVE(24, MOVE_FLAMEBURST),
+	LEVEL_UP_MOVE(27, MOVE_SCORCHINGSANDS),
+	LEVEL_UP_MOVE(30, MOVE_ROCKSLIDE),
+	LEVEL_UP_MOVE(33, MOVE_LAVAPLUME),
 	LEVEL_UP_MOVE(36, MOVE_AMNESIA),
-	LEVEL_UP_MOVE(41, MOVE_BODYSLAM),
-	LEVEL_UP_MOVE(43, MOVE_RECOVER),
-	LEVEL_UP_MOVE(48, MOVE_FLAMETHROWER),
-	LEVEL_UP_MOVE(50, MOVE_EARTHPOWER),
+	LEVEL_UP_MOVE(39, MOVE_BODYSLAM),
+	LEVEL_UP_MOVE(42, MOVE_RECOVER),
+	LEVEL_UP_MOVE(45, MOVE_FLAMETHROWER),
+	LEVEL_UP_MOVE(48, MOVE_EARTHPOWER),
+	LEVEL_UP_MOVE(51, MOVE_MAGMASTORM),
 	LEVEL_UP_END
 };
 
@@ -4394,16 +4453,19 @@ static const struct LevelUpMove sMagcargoLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 8, MOVE_ROCKTHROW),
 	LEVEL_UP_MOVE(13, MOVE_HARDEN),
 	LEVEL_UP_MOVE(15, MOVE_INCINERATE),
-	LEVEL_UP_MOVE(20, MOVE_CLEARSMOG),
-	LEVEL_UP_MOVE(22, MOVE_ANCIENTPOWER),
-	LEVEL_UP_MOVE(27, MOVE_FLAMEBURST),
-	LEVEL_UP_MOVE(29, MOVE_ROCKSLIDE),
-	LEVEL_UP_MOVE(34, MOVE_LAVAPLUME),
+	LEVEL_UP_MOVE(18, MOVE_CLEARSMOG),
+	LEVEL_UP_MOVE(21, MOVE_ANCIENTPOWER),
+	LEVEL_UP_MOVE(24, MOVE_FLAMEBURST),
+	LEVEL_UP_MOVE(27, MOVE_SCORCHINGSANDS),
+	LEVEL_UP_MOVE(30, MOVE_ROCKSLIDE),
+	LEVEL_UP_MOVE(33, MOVE_LAVAPLUME),
 	LEVEL_UP_MOVE(36, MOVE_AMNESIA),
-	LEVEL_UP_MOVE(43, MOVE_BODYSLAM),
-	LEVEL_UP_MOVE(47, MOVE_RECOVER),
-	LEVEL_UP_MOVE(54, MOVE_FLAMETHROWER),
-	LEVEL_UP_MOVE(58, MOVE_EARTHPOWER),
+	LEVEL_UP_MOVE(37, MOVE_SHELLSMASH),
+	LEVEL_UP_MOVE(42, MOVE_BODYSLAM),
+	LEVEL_UP_MOVE(46, MOVE_RECOVER),
+	LEVEL_UP_MOVE(50, MOVE_FLAMETHROWER),
+	LEVEL_UP_MOVE(54, MOVE_EARTHPOWER),
+	LEVEL_UP_MOVE(58, MOVE_MAGMASTORM),
 	LEVEL_UP_END
 };
 
@@ -4515,7 +4577,18 @@ static const struct LevelUpMove sOctilleryLevelUpLearnset[] = {
 
 static const struct LevelUpMove sDelibirdLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_PRESENT),
-	LEVEL_UP_MOVE(25, MOVE_DRILLPECK),
+	LEVEL_UP_MOVE(10, MOVE_FAKEOUT),
+	LEVEL_UP_MOVE(13, MOVE_ICYWIND),
+	LEVEL_UP_MOVE(16, MOVE_PLUCK),
+	LEVEL_UP_MOVE(19, MOVE_AURORABEAM),
+	LEVEL_UP_MOVE(22, MOVE_BESTOW),
+	LEVEL_UP_MOVE(24, MOVE_DRILLPECK),
+	LEVEL_UP_MOVE(27, MOVE_AGILITY),
+	LEVEL_UP_MOVE(29, MOVE_FREEZEDRY),
+	LEVEL_UP_MOVE(32, MOVE_SPIKES),
+	LEVEL_UP_MOVE(34, MOVE_ICEPUNCH),
+	LEVEL_UP_MOVE(37, MOVE_DEFOG),
+	LEVEL_UP_MOVE(39, MOVE_BRAVEBIRD),
 	LEVEL_UP_END
 };
 
@@ -4568,44 +4641,44 @@ static const struct LevelUpMove sHoundourLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_LEER),
 	LEVEL_UP_MOVE( 1, MOVE_EMBER),
 	LEVEL_UP_MOVE( 4, MOVE_HOWL),
-	LEVEL_UP_MOVE( 8, MOVE_SMOG),
-	LEVEL_UP_MOVE(13, MOVE_ROAR),
-	LEVEL_UP_MOVE(16, MOVE_BITE),
-	LEVEL_UP_MOVE(20, MOVE_ODORSLEUTH),
-	LEVEL_UP_MOVE(25, MOVE_BEATUP),
-	LEVEL_UP_MOVE(28, MOVE_FIREFANG),
-	LEVEL_UP_MOVE(32, MOVE_FEINTATTACK),
-	LEVEL_UP_MOVE(37, MOVE_EMBARGO),
-	LEVEL_UP_MOVE(40, MOVE_FOULPLAY),
-	LEVEL_UP_MOVE(44, MOVE_FLAMETHROWER),
-	LEVEL_UP_MOVE(49, MOVE_CRUNCH),
-	LEVEL_UP_MOVE(52, MOVE_NASTYPLOT),
-	LEVEL_UP_MOVE(56, MOVE_INFERNO),
+	LEVEL_UP_MOVE( 7, MOVE_SMOG),
+	LEVEL_UP_MOVE(10, MOVE_PURSUIT),
+	LEVEL_UP_MOVE(13, MOVE_ODORSLEUTH),
+	LEVEL_UP_MOVE(16, MOVE_FIREFANG),
+	LEVEL_UP_MOVE(19, MOVE_BITE),
+	LEVEL_UP_MOVE(22, MOVE_ROAR),
+	LEVEL_UP_MOVE(25, MOVE_PUNISHMENT),
+	LEVEL_UP_MOVE(28, MOVE_INCINERATE),
+	LEVEL_UP_MOVE(32, MOVE_CRUNCH),
+	LEVEL_UP_MOVE(36, MOVE_EMBARGO),
+	LEVEL_UP_MOVE(39, MOVE_FLAMETHROWER),
+	LEVEL_UP_MOVE(43, MOVE_FOULPLAY),
+	LEVEL_UP_MOVE(47, MOVE_NASTYPLOT),
+	LEVEL_UP_MOVE(50, MOVE_FIERYWRATH),
+	LEVEL_UP_MOVE(54, MOVE_INFERNO),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sHoundoomLevelUpLearnset[] = {
-	LEVEL_UP_MOVE( 1, MOVE_INFERNO),
-	LEVEL_UP_MOVE( 1, MOVE_NASTYPLOT),
 	LEVEL_UP_MOVE( 1, MOVE_THUNDERFANG),
 	LEVEL_UP_MOVE( 1, MOVE_LEER),
 	LEVEL_UP_MOVE( 1, MOVE_EMBER),
 	LEVEL_UP_MOVE( 1, MOVE_HOWL),
 	LEVEL_UP_MOVE( 1, MOVE_SMOG),
-	LEVEL_UP_MOVE( 4, MOVE_HOWL),
-	LEVEL_UP_MOVE( 8, MOVE_SMOG),
-	LEVEL_UP_MOVE(13, MOVE_ROAR),
-	LEVEL_UP_MOVE(16, MOVE_BITE),
-	LEVEL_UP_MOVE(20, MOVE_ODORSLEUTH),
-	LEVEL_UP_MOVE(26, MOVE_BEATUP),
-	LEVEL_UP_MOVE(30, MOVE_FIREFANG),
-	LEVEL_UP_MOVE(35, MOVE_FEINTATTACK),
-	LEVEL_UP_MOVE(41, MOVE_EMBARGO),
-	LEVEL_UP_MOVE(45, MOVE_FOULPLAY),
-	LEVEL_UP_MOVE(50, MOVE_FLAMETHROWER),
-	LEVEL_UP_MOVE(56, MOVE_CRUNCH),
-	LEVEL_UP_MOVE(60, MOVE_NASTYPLOT),
-	LEVEL_UP_MOVE(65, MOVE_INFERNO),
+	LEVEL_UP_MOVE(10, MOVE_PURSUIT),
+	LEVEL_UP_MOVE(13, MOVE_ODORSLEUTH),
+	LEVEL_UP_MOVE(16, MOVE_FIREFANG),
+	LEVEL_UP_MOVE(19, MOVE_BITE),
+	LEVEL_UP_MOVE(22, MOVE_ROAR),
+	LEVEL_UP_MOVE(26, MOVE_PUNISHMENT),
+	LEVEL_UP_MOVE(30, MOVE_INCINERATE),
+	LEVEL_UP_MOVE(35, MOVE_CRUNCH),
+	LEVEL_UP_MOVE(40, MOVE_EMBARGO),
+	LEVEL_UP_MOVE(44, MOVE_FLAMETHROWER),
+	LEVEL_UP_MOVE(49, MOVE_FOULPLAY),
+	LEVEL_UP_MOVE(54, MOVE_NASTYPLOT),
+	LEVEL_UP_MOVE(58, MOVE_FIERYWRATH),
+	LEVEL_UP_MOVE(63, MOVE_INFERNO),
 	LEVEL_UP_END
 };
 
@@ -4699,14 +4772,15 @@ static const struct LevelUpMove sStantlerLevelUpLearnset[] = {
 	LEVEL_UP_MOVE(13, MOVE_STOMP),
 	LEVEL_UP_MOVE(16, MOVE_SANDATTACK),
 	LEVEL_UP_MOVE(21, MOVE_TAKEDOWN),
-	LEVEL_UP_MOVE(23, MOVE_CONFUSERAY),
+	LEVEL_UP_MOVE(24, MOVE_CONFUSERAY),
 	LEVEL_UP_MOVE(27, MOVE_CALMMIND),
-	LEVEL_UP_MOVE(33, MOVE_ROLEPLAY),
-	LEVEL_UP_MOVE(38, MOVE_ZENHEADBUTT),
-	LEVEL_UP_MOVE(43, MOVE_JUMPKICK),
-	LEVEL_UP_MOVE(49, MOVE_IMPRISON),
-	LEVEL_UP_MOVE(50, MOVE_CAPTIVATE),
-	LEVEL_UP_MOVE(55, MOVE_MEFIRST),
+	LEVEL_UP_MOVE(32, MOVE_ZENHEADBUTT),
+	LEVEL_UP_MOVE(38, MOVE_ROLEPLAY),
+	LEVEL_UP_MOVE(43, MOVE_IMPRISON),
+	LEVEL_UP_MOVE(48, MOVE_JUMPKICK),
+	LEVEL_UP_MOVE(54, MOVE_MEGAHORN),
+	LEVEL_UP_MOVE(60, MOVE_NORETREAT),
+	LEVEL_UP_MOVE(65, MOVE_THRASH),
 	LEVEL_UP_END
 };
 
@@ -4854,9 +4928,9 @@ static const struct LevelUpMove sBlisseyLevelUpLearnset[] = {
 };
 
 static const struct LevelUpMove sRaikouLevelUpLearnset[] = {
-	LEVEL_UP_MOVE( 1, MOVE_EXTRASENSORY),
-	LEVEL_UP_MOVE( 1, MOVE_DISCHARGE),
-	LEVEL_UP_MOVE( 1, MOVE_BITE),
+	LEVEL_UP_MOVE( 1, MOVE_EXTREMESPEED),
+	LEVEL_UP_MOVE( 1, MOVE_AURASPHERE),
+	LEVEL_UP_MOVE( 1, MOVE_THUNDERSHOCK),
 	LEVEL_UP_MOVE( 1, MOVE_LEER),
 	LEVEL_UP_MOVE( 8, MOVE_THUNDERSHOCK),
 	LEVEL_UP_MOVE(15, MOVE_ROAR),
@@ -5229,19 +5303,19 @@ static const struct LevelUpMove sPoochyenaLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_TACKLE),
 	LEVEL_UP_MOVE( 4, MOVE_HOWL),
 	LEVEL_UP_MOVE( 7, MOVE_SANDATTACK),
-	LEVEL_UP_MOVE(10, MOVE_BITE),
-	LEVEL_UP_MOVE(13, MOVE_ODORSLEUTH),
-	LEVEL_UP_MOVE(16, MOVE_ROAR),
-	LEVEL_UP_MOVE(19, MOVE_SWAGGER),
-	LEVEL_UP_MOVE(22, MOVE_ASSURANCE),
-	LEVEL_UP_MOVE(25, MOVE_SCARYFACE),
-	LEVEL_UP_MOVE(28, MOVE_EMBARGO),
-	LEVEL_UP_MOVE(31, MOVE_TAUNT),
-	LEVEL_UP_MOVE(34, MOVE_CRUNCH),
-	LEVEL_UP_MOVE(37, MOVE_YAWN),
-	LEVEL_UP_MOVE(40, MOVE_TAKEDOWN),
-	LEVEL_UP_MOVE(43, MOVE_SUCKERPUNCH),
-	LEVEL_UP_MOVE(46, MOVE_PLAYROUGH),
+	LEVEL_UP_MOVE( 9, MOVE_ODORSLEUTH),
+	LEVEL_UP_MOVE(12, MOVE_ASSURANCE),
+	LEVEL_UP_MOVE(16, MOVE_SWAGGER),
+	LEVEL_UP_MOVE(19, MOVE_ROAR),
+	LEVEL_UP_MOVE(22, MOVE_BITE),
+	LEVEL_UP_MOVE(26, MOVE_SCARYFACE),
+	LEVEL_UP_MOVE(29, MOVE_TAKEDOWN),
+	LEVEL_UP_MOVE(33, MOVE_SUCKERPUNCH),
+	LEVEL_UP_MOVE(37, MOVE_EMBARGO),
+	LEVEL_UP_MOVE(40, MOVE_CRUNCH),
+	LEVEL_UP_MOVE(44, MOVE_TAUNT),
+	LEVEL_UP_MOVE(47, MOVE_YAWN),
+	LEVEL_UP_MOVE(50, MOVE_PLAYROUGH),
 	LEVEL_UP_END
 };
 
@@ -5256,22 +5330,20 @@ static const struct LevelUpMove sMightyenaLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_TACKLE),
 	LEVEL_UP_MOVE( 1, MOVE_HOWL),
 	LEVEL_UP_MOVE( 1, MOVE_SANDATTACK),
-	LEVEL_UP_MOVE( 1, MOVE_BITE),
-	LEVEL_UP_MOVE( 4, MOVE_HOWL),
-	LEVEL_UP_MOVE( 7, MOVE_SANDATTACK),
-	LEVEL_UP_MOVE(10, MOVE_BITE),
-	LEVEL_UP_MOVE(13, MOVE_ODORSLEUTH),
-	LEVEL_UP_MOVE(16, MOVE_ROAR),
-	LEVEL_UP_MOVE(20, MOVE_SWAGGER),
-	LEVEL_UP_MOVE(24, MOVE_ASSURANCE),
-	LEVEL_UP_MOVE(28, MOVE_SCARYFACE),
-	LEVEL_UP_MOVE(32, MOVE_EMBARGO),
-	LEVEL_UP_MOVE(36, MOVE_TAUNT),
-	LEVEL_UP_MOVE(40, MOVE_CRUNCH),
-	LEVEL_UP_MOVE(44, MOVE_YAWN),
-	LEVEL_UP_MOVE(48, MOVE_TAKEDOWN),
-	LEVEL_UP_MOVE(52, MOVE_SUCKERPUNCH),
-	LEVEL_UP_MOVE(56, MOVE_PLAYROUGH),
+	LEVEL_UP_MOVE( 1, MOVE_ODORSLEUTH),
+	LEVEL_UP_MOVE(12, MOVE_ASSURANCE),
+	LEVEL_UP_MOVE(16, MOVE_SWAGGER),
+	LEVEL_UP_MOVE(17, MOVE_SNARL),
+	LEVEL_UP_MOVE(20, MOVE_ROAR),
+	LEVEL_UP_MOVE(24, MOVE_BITE),
+	LEVEL_UP_MOVE(29, MOVE_SCARYFACE),
+	LEVEL_UP_MOVE(33, MOVE_TAKEDOWN),
+	LEVEL_UP_MOVE(38, MOVE_SUCKERPUNCH),
+	LEVEL_UP_MOVE(43, MOVE_EMBARGO),
+	LEVEL_UP_MOVE(47, MOVE_CRUNCH),
+	LEVEL_UP_MOVE(52, MOVE_TAUNT),
+	LEVEL_UP_MOVE(56, MOVE_YAWN),
+	LEVEL_UP_MOVE(60, MOVE_PLAYROUGH),
 	LEVEL_UP_END
 };
 
@@ -5335,19 +5407,26 @@ static const struct LevelUpMove sSilcoonLevelUpLearnset[] = {
 
 static const struct LevelUpMove sBeautiflyLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 0, MOVE_GUST),
-	LEVEL_UP_MOVE( 1, MOVE_GUST),
+	LEVEL_UP_MOVE( 1, MOVE_RAGE),
+	LEVEL_UP_MOVE( 1, MOVE_HARDEN),
+	LEVEL_UP_MOVE( 1, MOVE_TACKLE),
+	LEVEL_UP_MOVE( 1, MOVE_STRINGSHOT),
+	LEVEL_UP_MOVE( 1, MOVE_POISONSTING),
+	LEVEL_UP_MOVE( 1, MOVE_BUGBITE),
+	LEVEL_UP_MOVE( 9, MOVE_GUST),
 	LEVEL_UP_MOVE(12, MOVE_ABSORB),
 	LEVEL_UP_MOVE(15, MOVE_STUNSPORE),
-	LEVEL_UP_MOVE(17, MOVE_MORNINGSUN),
-	LEVEL_UP_MOVE(20, MOVE_AIRCUTTER),
-	LEVEL_UP_MOVE(22, MOVE_MEGADRAIN),
-	LEVEL_UP_MOVE(25, MOVE_SILVERWIND),
-	LEVEL_UP_MOVE(27, MOVE_ATTRACT),
-	LEVEL_UP_MOVE(30, MOVE_WHIRLWIND),
-	LEVEL_UP_MOVE(32, MOVE_GIGADRAIN),
-	LEVEL_UP_MOVE(35, MOVE_BUGBUZZ),
-	LEVEL_UP_MOVE(37, MOVE_RAGE),
-	LEVEL_UP_MOVE(40, MOVE_QUIVERDANCE),
+	LEVEL_UP_MOVE(18, MOVE_STRUGGLEBUG),
+	LEVEL_UP_MOVE(21, MOVE_MORNINGSUN),
+	LEVEL_UP_MOVE(24, MOVE_AIRCUTTER),
+	LEVEL_UP_MOVE(27, MOVE_MEGADRAIN),
+	LEVEL_UP_MOVE(30, MOVE_SILVERWIND),
+	LEVEL_UP_MOVE(33, MOVE_ATTRACT),
+	LEVEL_UP_MOVE(36, MOVE_WHIRLWIND),
+	LEVEL_UP_MOVE(39, MOVE_GIGADRAIN),
+	LEVEL_UP_MOVE(42, MOVE_BUGBUZZ),
+	LEVEL_UP_MOVE(45, MOVE_AIRSLASH),
+	LEVEL_UP_MOVE(48, MOVE_QUIVERDANCE),
 	LEVEL_UP_END
 };
 
@@ -5362,16 +5441,17 @@ static const struct LevelUpMove sDustoxLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_GUST),
 	LEVEL_UP_MOVE(12, MOVE_CONFUSION),
 	LEVEL_UP_MOVE(15, MOVE_POISONPOWDER),
-	LEVEL_UP_MOVE(17, MOVE_MOONLIGHT),
-	LEVEL_UP_MOVE(20, MOVE_VENOSHOCK),
-	LEVEL_UP_MOVE(22, MOVE_PSYBEAM),
-	LEVEL_UP_MOVE(25, MOVE_SILVERWIND),
-	LEVEL_UP_MOVE(27, MOVE_LIGHTSCREEN),
-	LEVEL_UP_MOVE(30, MOVE_WHIRLWIND),
-	LEVEL_UP_MOVE(32, MOVE_TOXIC),
-	LEVEL_UP_MOVE(35, MOVE_BUGBUZZ),
-	LEVEL_UP_MOVE(37, MOVE_PROTECT),
-	LEVEL_UP_MOVE(40, MOVE_QUIVERDANCE),
+	LEVEL_UP_MOVE(18, MOVE_STRUGGLEBUG),
+	LEVEL_UP_MOVE(21, MOVE_MOONLIGHT),
+	LEVEL_UP_MOVE(24, MOVE_VENOSHOCK),
+	LEVEL_UP_MOVE(27, MOVE_PSYBEAM),
+	LEVEL_UP_MOVE(30, MOVE_LUNGE),
+	LEVEL_UP_MOVE(33, MOVE_LIGHTSCREEN),
+	LEVEL_UP_MOVE(36, MOVE_WHIRLWIND),
+	LEVEL_UP_MOVE(39, MOVE_TOXICTHREAD),
+	LEVEL_UP_MOVE(42, MOVE_BUGBUZZ),
+	LEVEL_UP_MOVE(45, MOVE_PROTECT),
+	LEVEL_UP_MOVE(48, MOVE_QUIVERDANCE),
 	LEVEL_UP_END
 };
 
@@ -5690,6 +5770,7 @@ static const struct LevelUpMove sMasquerainLevelUpLearnset[] = {
 	LEVEL_UP_MOVE(42, MOVE_BUGBUZZ),
 	LEVEL_UP_MOVE(48, MOVE_WHIRLWIND),
 	LEVEL_UP_MOVE(52, MOVE_QUIVERDANCE),
+	LEVEL_UP_MOVE(56, MOVE_HURRICANE),
 	LEVEL_UP_END
 };
 
@@ -6094,70 +6175,83 @@ static const struct LevelUpMove sSharpedoLevelUpLearnset[] = {
 
 static const struct LevelUpMove sTrapinchLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_SANDATTACK),
-	LEVEL_UP_MOVE( 1, MOVE_BITE),
-	LEVEL_UP_MOVE( 1, MOVE_FEINTATTACK),
+	LEVEL_UP_MOVE( 1, MOVE_ASTONISH),
 	LEVEL_UP_MOVE( 1, MOVE_BIDE),
-	LEVEL_UP_MOVE( 5, MOVE_MUDSLAP),
-	LEVEL_UP_MOVE( 8, MOVE_BULLDOZE),
-	LEVEL_UP_MOVE(12, MOVE_SANDTOMB),
-	LEVEL_UP_MOVE(15, MOVE_ROCKSLIDE),
-	LEVEL_UP_MOVE(19, MOVE_DIG),
-	LEVEL_UP_MOVE(22, MOVE_CRUNCH),
-	LEVEL_UP_MOVE(26, MOVE_EARTHPOWER),
-	LEVEL_UP_MOVE(29, MOVE_FEINT),
-	LEVEL_UP_MOVE(33, MOVE_EARTHQUAKE),
-	LEVEL_UP_MOVE(36, MOVE_SANDSTORM),
-	LEVEL_UP_MOVE(40, MOVE_SUPERPOWER),
-	LEVEL_UP_MOVE(43, MOVE_HYPERBEAM),
-	LEVEL_UP_MOVE(47, MOVE_FISSURE),
+	LEVEL_UP_MOVE( 4, MOVE_LASERFOCUS),
+	LEVEL_UP_MOVE( 7, MOVE_MUDSLAP),
+	LEVEL_UP_MOVE(11, MOVE_BITE),
+	LEVEL_UP_MOVE(15, MOVE_SANDTOMB),
+	LEVEL_UP_MOVE(19, MOVE_FEINT),
+	LEVEL_UP_MOVE(23, MOVE_BULLDOZE),
+	LEVEL_UP_MOVE(27, MOVE_ROCKSLIDE),
+	LEVEL_UP_MOVE(31, MOVE_DIG),
+	LEVEL_UP_MOVE(35, MOVE_CRUNCH),
+	LEVEL_UP_MOVE(39, MOVE_EARTHPOWER),
+	LEVEL_UP_MOVE(43, MOVE_SANDSTORM),
+	LEVEL_UP_MOVE(46, MOVE_EARTHQUAKE),
+	LEVEL_UP_MOVE(50, MOVE_SUPERPOWER),
+	LEVEL_UP_MOVE(54, MOVE_HYPERBEAM),
+	LEVEL_UP_MOVE(58, MOVE_FISSURE),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sVibravaLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 0, MOVE_DRAGONBREATH),
-	LEVEL_UP_MOVE( 1, MOVE_DRAGONBREATH),
+	LEVEL_UP_MOVE( 1, MOVE_DRAGONRUSH),
+	LEVEL_UP_MOVE( 1, MOVE_LASERFOCUS),
+	LEVEL_UP_MOVE( 1, MOVE_BITE),
+	LEVEL_UP_MOVE( 1, MOVE_FEINT),
+	LEVEL_UP_MOVE( 1, MOVE_DIG),
+	LEVEL_UP_MOVE( 1, MOVE_CRUNCH),
+	LEVEL_UP_MOVE( 1, MOVE_SUPERPOWER),
+	LEVEL_UP_MOVE( 1, MOVE_HYPERBEAM),
+	LEVEL_UP_MOVE( 1, MOVE_FISSURE),
 	LEVEL_UP_MOVE( 1, MOVE_SANDATTACK),
-	LEVEL_UP_MOVE( 1, MOVE_SONICBOOM),
-	LEVEL_UP_MOVE( 1, MOVE_FEINTATTACK),
+	LEVEL_UP_MOVE( 1, MOVE_ASTONISH),
 	LEVEL_UP_MOVE( 1, MOVE_BIDE),
-	LEVEL_UP_MOVE( 5, MOVE_MUDSLAP),
-	LEVEL_UP_MOVE( 8, MOVE_BULLDOZE),
-	LEVEL_UP_MOVE(12, MOVE_SANDTOMB),
-	LEVEL_UP_MOVE(15, MOVE_ROCKSLIDE),
-	LEVEL_UP_MOVE(19, MOVE_SUPERSONIC),
-	LEVEL_UP_MOVE(22, MOVE_SCREECH),
-	LEVEL_UP_MOVE(26, MOVE_EARTHPOWER),
-	LEVEL_UP_MOVE(29, MOVE_BUGBUZZ),
-	LEVEL_UP_MOVE(33, MOVE_EARTHQUAKE),
-	LEVEL_UP_MOVE(36, MOVE_SANDSTORM),
-	LEVEL_UP_MOVE(40, MOVE_UPROAR),
-	LEVEL_UP_MOVE(43, MOVE_HYPERBEAM),
-	LEVEL_UP_MOVE(47, MOVE_BOOMBURST),
+	LEVEL_UP_MOVE( 4, MOVE_SUPERSONIC),
+	LEVEL_UP_MOVE( 7, MOVE_MUDSLAP),
+	LEVEL_UP_MOVE(11, MOVE_SONICBOOM),
+	LEVEL_UP_MOVE(15, MOVE_SANDTOMB),
+	LEVEL_UP_MOVE(19, MOVE_DRAGONTAIL),
+	LEVEL_UP_MOVE(23, MOVE_BULLDOZE),
+	LEVEL_UP_MOVE(27, MOVE_ROCKSLIDE),
+	LEVEL_UP_MOVE(31, MOVE_SCREECH),
+	LEVEL_UP_MOVE(34, MOVE_DRAGONBREATH),
+	LEVEL_UP_MOVE(35, MOVE_BUGBUZZ),
+	LEVEL_UP_MOVE(40, MOVE_EARTHPOWER),
+	LEVEL_UP_MOVE(45, MOVE_UPROAR),
+	LEVEL_UP_MOVE(50, MOVE_EARTHQUAKE),
+	LEVEL_UP_MOVE(55, MOVE_SANDSTORM),
+	LEVEL_UP_MOVE(59, MOVE_CLANGINGSCALES),
+	LEVEL_UP_MOVE(64, MOVE_BOOMBURST),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sFlygonLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 0, MOVE_DRAGONCLAW),
-	LEVEL_UP_MOVE( 1, MOVE_DRAGONCLAW),
-	LEVEL_UP_MOVE( 1, MOVE_DRAGONBREATH),
+	LEVEL_UP_MOVE( 1, MOVE_DRAGONRUSH),
 	LEVEL_UP_MOVE( 1, MOVE_DRAGONDANCE),
 	LEVEL_UP_MOVE( 1, MOVE_SANDATTACK),
-	LEVEL_UP_MOVE( 1, MOVE_SONICBOOM),
-	LEVEL_UP_MOVE( 1, MOVE_FEINTATTACK),
+	LEVEL_UP_MOVE( 1, MOVE_ASTONISH),
 	LEVEL_UP_MOVE( 1, MOVE_BIDE),
-	LEVEL_UP_MOVE( 5, MOVE_MUDSLAP),
-	LEVEL_UP_MOVE( 8, MOVE_BULLDOZE),
-	LEVEL_UP_MOVE(12, MOVE_SANDTOMB),
-	LEVEL_UP_MOVE(15, MOVE_ROCKSLIDE),
-	LEVEL_UP_MOVE(19, MOVE_SUPERSONIC),
-	LEVEL_UP_MOVE(22, MOVE_SCREECH),
-	LEVEL_UP_MOVE(26, MOVE_EARTHPOWER),
-	LEVEL_UP_MOVE(29, MOVE_DRAGONTAIL),
-	LEVEL_UP_MOVE(33, MOVE_EARTHQUAKE),
-	LEVEL_UP_MOVE(36, MOVE_SANDSTORM),
-	LEVEL_UP_MOVE(40, MOVE_UPROAR),
-	LEVEL_UP_MOVE(43, MOVE_HYPERBEAM),
-	LEVEL_UP_MOVE(47, MOVE_DRAGONRUSH),
+	LEVEL_UP_MOVE( 4, MOVE_SUPERSONIC),
+	LEVEL_UP_MOVE( 7, MOVE_MUDSLAP),
+	LEVEL_UP_MOVE(11, MOVE_SONICBOOM),
+	LEVEL_UP_MOVE(15, MOVE_SANDTOMB),
+	LEVEL_UP_MOVE(19, MOVE_DRAGONTAIL),
+	LEVEL_UP_MOVE(23, MOVE_BULLDOZE),
+	LEVEL_UP_MOVE(27, MOVE_ROCKSLIDE),
+	LEVEL_UP_MOVE(31, MOVE_SCREECH),
+	LEVEL_UP_MOVE(34, MOVE_DRAGONBREATH),
+	LEVEL_UP_MOVE(35, MOVE_BUGBUZZ),
+	LEVEL_UP_MOVE(40, MOVE_EARTHPOWER),
+	LEVEL_UP_MOVE(44, MOVE_DRAGONCLAW),
+	LEVEL_UP_MOVE(45, MOVE_UPROAR),
+	LEVEL_UP_MOVE(52, MOVE_EARTHQUAKE),
+	LEVEL_UP_MOVE(58, MOVE_SANDSTORM),
+	LEVEL_UP_MOVE(63, MOVE_CLANGINGSCALES),
+	LEVEL_UP_MOVE(69, MOVE_BOOMBURST),
 	LEVEL_UP_END
 };
 
@@ -6168,22 +6262,23 @@ static const struct LevelUpMove sMakuhitaLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 7, MOVE_ARMTHRUST),
 	LEVEL_UP_MOVE(10, MOVE_FAKEOUT),
 	LEVEL_UP_MOVE(13, MOVE_FORCEPALM),
-	LEVEL_UP_MOVE(16, MOVE_WHIRLWIND),
-	LEVEL_UP_MOVE(19, MOVE_KNOCKOFF),
-	LEVEL_UP_MOVE(22, MOVE_VITALTHROW),
-	LEVEL_UP_MOVE(25, MOVE_BELLYDRUM),
-	LEVEL_UP_MOVE(28, MOVE_SMELLINGSALTS),
-	LEVEL_UP_MOVE(31, MOVE_SEISMICTOSS),
-	LEVEL_UP_MOVE(34, MOVE_WAKEUPSLAP),
-	LEVEL_UP_MOVE(37, MOVE_ENDURE),
-	LEVEL_UP_MOVE(40, MOVE_CLOSECOMBAT),
-	LEVEL_UP_MOVE(43, MOVE_REVERSAL),
+	LEVEL_UP_MOVE(16, MOVE_KNOCKOFF),
+	LEVEL_UP_MOVE(19, MOVE_WIDEGUARD),
+	LEVEL_UP_MOVE(21, MOVE_WAKEUPSLAP),
+	LEVEL_UP_MOVE(24, MOVE_SMELLINGSALTS),
+	LEVEL_UP_MOVE(27, MOVE_WHIRLWIND),
+	LEVEL_UP_MOVE(29, MOVE_SEISMICTOSS),
+	LEVEL_UP_MOVE(32, MOVE_BELLYDRUM),
+	LEVEL_UP_MOVE(35, MOVE_REVENGE),
+	LEVEL_UP_MOVE(39, MOVE_ENDURE),
+	LEVEL_UP_MOVE(42, MOVE_REVERSAL),
 	LEVEL_UP_MOVE(46, MOVE_HEAVYSLAM),
+	LEVEL_UP_MOVE(50, MOVE_CLOSECOMBAT),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sHariyamaLevelUpLearnset[] = {
-	LEVEL_UP_MOVE( 1, MOVE_BRINE),
+	LEVEL_UP_MOVE( 0, MOVE_BRINE),
 	LEVEL_UP_MOVE( 1, MOVE_TACKLE),
 	LEVEL_UP_MOVE( 1, MOVE_FOCUSENERGY),
 	LEVEL_UP_MOVE( 1, MOVE_SANDATTACK),
@@ -6192,17 +6287,18 @@ static const struct LevelUpMove sHariyamaLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 7, MOVE_ARMTHRUST),
 	LEVEL_UP_MOVE(10, MOVE_FAKEOUT),
 	LEVEL_UP_MOVE(13, MOVE_FORCEPALM),
-	LEVEL_UP_MOVE(16, MOVE_WHIRLWIND),
-	LEVEL_UP_MOVE(19, MOVE_KNOCKOFF),
-	LEVEL_UP_MOVE(22, MOVE_VITALTHROW),
-	LEVEL_UP_MOVE(26, MOVE_BELLYDRUM),
-	LEVEL_UP_MOVE(30, MOVE_SMELLINGSALTS),
-	LEVEL_UP_MOVE(34, MOVE_SEISMICTOSS),
-	LEVEL_UP_MOVE(38, MOVE_WAKEUPSLAP),
-	LEVEL_UP_MOVE(42, MOVE_ENDURE),
-	LEVEL_UP_MOVE(46, MOVE_CLOSECOMBAT),
-	LEVEL_UP_MOVE(50, MOVE_REVERSAL),
-	LEVEL_UP_MOVE(54, MOVE_HEAVYSLAM),
+	LEVEL_UP_MOVE(16, MOVE_KNOCKOFF),
+	LEVEL_UP_MOVE(19, MOVE_WIDEGUARD),
+	LEVEL_UP_MOVE(21, MOVE_WAKEUPSLAP),
+	LEVEL_UP_MOVE(24, MOVE_SMELLINGSALTS),
+	LEVEL_UP_MOVE(28, MOVE_WHIRLWIND),
+	LEVEL_UP_MOVE(31, MOVE_SEISMICTOSS),
+	LEVEL_UP_MOVE(35, MOVE_BELLYDRUM),
+	LEVEL_UP_MOVE(39, MOVE_REVENGE),
+	LEVEL_UP_MOVE(44, MOVE_ENDURE),
+	LEVEL_UP_MOVE(47, MOVE_REVERSAL),
+	LEVEL_UP_MOVE(52, MOVE_HEAVYSLAM),
+	LEVEL_UP_MOVE(57, MOVE_CLOSECOMBAT),
 	LEVEL_UP_END
 };
 
@@ -6456,7 +6552,7 @@ static const struct LevelUpMove sLunatoneLevelUpLearnset[] = {
 	LEVEL_UP_MOVE(17, MOVE_EMBARGO),
 	LEVEL_UP_MOVE(21, MOVE_ROCKSLIDE),
 	LEVEL_UP_MOVE(25, MOVE_COSMICPOWER),
-	LEVEL_UP_MOVE(29, MOVE_PSYCHIC),
+	LEVEL_UP_MOVE(29, MOVE_EERIESPELL),
 	LEVEL_UP_MOVE(33, MOVE_HEALBLOCK),
 	LEVEL_UP_MOVE(37, MOVE_STONEEDGE),
 	LEVEL_UP_MOVE(41, MOVE_FUTURESIGHT),
@@ -6477,7 +6573,7 @@ static const struct LevelUpMove sSolrockLevelUpLearnset[] = {
 	LEVEL_UP_MOVE(17, MOVE_EMBARGO),
 	LEVEL_UP_MOVE(21, MOVE_ROCKSLIDE),
 	LEVEL_UP_MOVE(25, MOVE_COSMICPOWER),
-	LEVEL_UP_MOVE(29, MOVE_PSYCHIC),
+	LEVEL_UP_MOVE(29, MOVE_EERIESPELL),
 	LEVEL_UP_MOVE(33, MOVE_HEALBLOCK),
 	LEVEL_UP_MOVE(37, MOVE_STONEEDGE),
 	LEVEL_UP_MOVE(41, MOVE_SOLARBEAM),
@@ -7343,16 +7439,17 @@ static const struct LevelUpMove sCradilyLevelUpLearnset[] = {
 static const struct LevelUpMove sAnorithLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_SCRATCH),
 	LEVEL_UP_MOVE( 1, MOVE_HARDEN),
-	LEVEL_UP_MOVE( 4, MOVE_MUDSPORT),
-	LEVEL_UP_MOVE( 7, MOVE_WATERGUN),
-	LEVEL_UP_MOVE(10, MOVE_FURYCUTTER),
-	LEVEL_UP_MOVE(13, MOVE_SMACKDOWN),
-	LEVEL_UP_MOVE(17, MOVE_METALCLAW),
-	LEVEL_UP_MOVE(21, MOVE_ANCIENTPOWER),
-	LEVEL_UP_MOVE(25, MOVE_BUGBITE),
-	LEVEL_UP_MOVE(29, MOVE_BRINE),
-	LEVEL_UP_MOVE(34, MOVE_SLASH),
-	LEVEL_UP_MOVE(39, MOVE_CRUSHCLAW),
+	LEVEL_UP_MOVE( 1, MOVE_MUDSPORT),
+	LEVEL_UP_MOVE( 4, MOVE_WATERGUN),
+	LEVEL_UP_MOVE( 8, MOVE_ANCIENTPOWER),
+	LEVEL_UP_MOVE(12, MOVE_METALCLAW),
+	LEVEL_UP_MOVE(16, MOVE_SMACKDOWN),
+	LEVEL_UP_MOVE(20, MOVE_BUGBITE),
+	LEVEL_UP_MOVE(24, MOVE_BRINE),
+	LEVEL_UP_MOVE(28, MOVE_SLASH),
+	LEVEL_UP_MOVE(32, MOVE_CRUSHCLAW),
+	LEVEL_UP_MOVE(36, MOVE_ROCKBLAST),
+	LEVEL_UP_MOVE(41, MOVE_PROTECT),
 	LEVEL_UP_MOVE(44, MOVE_XSCISSOR),
 	LEVEL_UP_MOVE(49, MOVE_PROTECT),
 	LEVEL_UP_MOVE(55, MOVE_ROCKBLAST),
@@ -7364,19 +7461,17 @@ static const struct LevelUpMove sArmaldoLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_HARDEN),
 	LEVEL_UP_MOVE( 1, MOVE_MUDSPORT),
 	LEVEL_UP_MOVE( 1, MOVE_WATERGUN),
-	LEVEL_UP_MOVE( 4, MOVE_MUDSPORT),
-	LEVEL_UP_MOVE( 7, MOVE_WATERGUN),
-	LEVEL_UP_MOVE(10, MOVE_FURYCUTTER),
-	LEVEL_UP_MOVE(13, MOVE_SMACKDOWN),
-	LEVEL_UP_MOVE(17, MOVE_METALCLAW),
-	LEVEL_UP_MOVE(21, MOVE_ANCIENTPOWER),
-	LEVEL_UP_MOVE(25, MOVE_BUGBITE),
-	LEVEL_UP_MOVE(29, MOVE_BRINE),
-	LEVEL_UP_MOVE(34, MOVE_SLASH),
-	LEVEL_UP_MOVE(39, MOVE_CRUSHCLAW),
-	LEVEL_UP_MOVE(46, MOVE_XSCISSOR),
-	LEVEL_UP_MOVE(53, MOVE_PROTECT),
-	LEVEL_UP_MOVE(61, MOVE_ROCKBLAST),
+	LEVEL_UP_MOVE( 8, MOVE_ANCIENTPOWER),
+	LEVEL_UP_MOVE(12, MOVE_METALCLAW),
+	LEVEL_UP_MOVE(16, MOVE_SMACKDOWN),
+	LEVEL_UP_MOVE(20, MOVE_BUGBITE),
+	LEVEL_UP_MOVE(24, MOVE_BRINE),
+	LEVEL_UP_MOVE(28, MOVE_SLASH),
+	LEVEL_UP_MOVE(32, MOVE_CRUSHCLAW),
+	LEVEL_UP_MOVE(36, MOVE_ROCKBLAST),
+	LEVEL_UP_MOVE(39, MOVE_AQUATAIL),
+	LEVEL_UP_MOVE(43, MOVE_PROTECT),
+	LEVEL_UP_MOVE(48, MOVE_XSCISSOR),
 	LEVEL_UP_END
 };
 
@@ -7440,17 +7535,17 @@ static const struct LevelUpMove sGardevoirLevelUpLearnset[] = {
 	LEVEL_UP_MOVE(11, MOVE_DISARMINGVOICE),
 	LEVEL_UP_MOVE(14, MOVE_WISH),
 	LEVEL_UP_MOVE(17, MOVE_MAGICALLEAF),
-	LEVEL_UP_MOVE(19, MOVE_HEALPULSE),
-	LEVEL_UP_MOVE(23, MOVE_DRAININGKISS),
-	LEVEL_UP_MOVE(26, MOVE_CALMMIND),
-	LEVEL_UP_MOVE(31, MOVE_PSYCHIC),
-	LEVEL_UP_MOVE(35, MOVE_IMPRISON),
-	LEVEL_UP_MOVE(40, MOVE_FUTURESIGHT),
-	LEVEL_UP_MOVE(44, MOVE_CAPTIVATE),
-	LEVEL_UP_MOVE(49, MOVE_HYPNOSIS),
-	LEVEL_UP_MOVE(53, MOVE_DREAMEATER),
-	LEVEL_UP_MOVE(58, MOVE_STOREDPOWER),
-	LEVEL_UP_MOVE(62, MOVE_MOONBLAST),
+	LEVEL_UP_MOVE(18, MOVE_PSYBEAM),
+	LEVEL_UP_MOVE(23, MOVE_LIFEDEW),
+	LEVEL_UP_MOVE(28, MOVE_CHARM),
+	LEVEL_UP_MOVE(29, MOVE_DRAININGKISS),
+	LEVEL_UP_MOVE(35, MOVE_CALMMIND),
+	LEVEL_UP_MOVE(39, MOVE_STOREDPOWER),
+	LEVEL_UP_MOVE(42, MOVE_IMPRISON),
+	LEVEL_UP_MOVE(48, MOVE_PSYCHIC),
+	LEVEL_UP_MOVE(53, MOVE_HEALPULSE),
+	LEVEL_UP_MOVE(56, MOVE_DAZZLINGGLEAM),
+	LEVEL_UP_MOVE(63, MOVE_DREAMEATER),
 	LEVEL_UP_END
 };
 
@@ -7666,6 +7761,7 @@ static const struct LevelUpMove sGroudonLevelUpLearnset[] = {
 };
 
 static const struct LevelUpMove sRayquazaLevelUpLearnset[] = {
+	LEVEL_UP_MOVE( 1, MOVE_DRAGONASCENT),
 	LEVEL_UP_MOVE( 1, MOVE_TWISTER),
 	LEVEL_UP_MOVE( 5, MOVE_SCARYFACE),
 	LEVEL_UP_MOVE(15, MOVE_ANCIENTPOWER),
@@ -7679,6 +7775,7 @@ static const struct LevelUpMove sRayquazaLevelUpLearnset[] = {
 	LEVEL_UP_MOVE(75, MOVE_HYPERVOICE),
 	LEVEL_UP_MOVE(80, MOVE_OUTRAGE),
 	LEVEL_UP_MOVE(90, MOVE_HYPERBEAM),
+	LEVEL_UP_MOVE(100, MOVE_VCREATE),
 	LEVEL_UP_END
 };
 
@@ -7731,22 +7828,26 @@ static const struct LevelUpMove sLatiosLevelUpLearnset[] = {
 };
 
 static const struct LevelUpMove sJirachiLevelUpLearnset[] = {
-	LEVEL_UP_MOVE( 1, MOVE_WISH),
+	LEVEL_UP_MOVE( 1, MOVE_HAPPYHOUR),
 	LEVEL_UP_MOVE( 1, MOVE_CONFUSION),
-	LEVEL_UP_MOVE( 5, MOVE_REST),
-	LEVEL_UP_MOVE(10, MOVE_SWIFT),
-	LEVEL_UP_MOVE(15, MOVE_HELPINGHAND),
-	LEVEL_UP_MOVE(20, MOVE_PSYCHIC),
-	LEVEL_UP_MOVE(25, MOVE_REFRESH),
-	LEVEL_UP_MOVE(30, MOVE_LUCKYCHANT),
-	LEVEL_UP_MOVE(35, MOVE_ZENHEADBUTT),
-	LEVEL_UP_MOVE(40, MOVE_DOUBLEEDGE),
-	LEVEL_UP_MOVE(45, MOVE_GRAVITY),
-	LEVEL_UP_MOVE(50, MOVE_HEALINGWISH),
-	LEVEL_UP_MOVE(55, MOVE_FUTURESIGHT),
-	LEVEL_UP_MOVE(60, MOVE_COSMICPOWER),
-	LEVEL_UP_MOVE(65, MOVE_LASTRESORT),
-	LEVEL_UP_MOVE(70, MOVE_DOOMDESIRE),
+	LEVEL_UP_MOVE( 1, MOVE_WISH),
+	LEVEL_UP_MOVE( 7, MOVE_SWIFT),
+	LEVEL_UP_MOVE(14, MOVE_HELPINGHAND),
+	LEVEL_UP_MOVE(20, MOVE_LIFEDEW),
+	LEVEL_UP_MOVE(26, MOVE_MISTBALL),
+	LEVEL_UP_MOVE(26, MOVE_ZENHEADBUTT),
+	LEVEL_UP_MOVE(32, MOVE_REFRESH),
+	LEVEL_UP_MOVE(32, MOVE_LUCKYCHANT),
+	LEVEL_UP_MOVE(38, MOVE_GRAVITY),
+	LEVEL_UP_MOVE(44, MOVE_PSYCHIC),
+	LEVEL_UP_MOVE(50, MOVE_METEORMASH),
+	LEVEL_UP_MOVE(56, MOVE_COSMICPOWER),
+	LEVEL_UP_MOVE(62, MOVE_DOUBLEEDGE),
+	LEVEL_UP_MOVE(68, MOVE_FUTURESIGHT),
+	LEVEL_UP_MOVE(75, MOVE_REST),
+	LEVEL_UP_MOVE(82, MOVE_HEALINGWISH),
+	LEVEL_UP_MOVE(89, MOVE_LASTRESORT),
+	LEVEL_UP_MOVE(96, MOVE_DOOMDESIRE),
 	LEVEL_UP_END
 };
 
@@ -8040,7 +8141,7 @@ static const struct LevelUpMove sBidoofLevelUpLearnset[] = {
 
 static const struct LevelUpMove sBibarelLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 0, MOVE_WATERGUN),
-	LEVEL_UP_MOVE( 1, MOVE_WATERGUN),
+	LEVEL_UP_MOVE( 1, MOVE_AMNESIA),
 	LEVEL_UP_MOVE( 1, MOVE_AQUAJET),
 	LEVEL_UP_MOVE( 1, MOVE_ROTOTILLER),
 	LEVEL_UP_MOVE( 1, MOVE_TACKLE),
@@ -8051,12 +8152,13 @@ static const struct LevelUpMove sBibarelLevelUpLearnset[] = {
 	LEVEL_UP_MOVE(18, MOVE_HYPERFANG),
 	LEVEL_UP_MOVE(23, MOVE_YAWN),
 	LEVEL_UP_MOVE(28, MOVE_CRUNCH),
-	LEVEL_UP_MOVE(33, MOVE_TAKEDOWN),
-	LEVEL_UP_MOVE(38, MOVE_SUPERFANG),
-	LEVEL_UP_MOVE(43, MOVE_SWORDSDANCE),
-	LEVEL_UP_MOVE(48, MOVE_AMNESIA),
-	LEVEL_UP_MOVE(53, MOVE_SUPERPOWER),
-	LEVEL_UP_MOVE(58, MOVE_CURSE),
+	LEVEL_UP_MOVE(33, MOVE_AQUATAIL),
+	LEVEL_UP_MOVE(38, MOVE_TAKEDOWN),
+	LEVEL_UP_MOVE(43, MOVE_SUPERFANG),
+	LEVEL_UP_MOVE(48, MOVE_SWORDSDANCE),
+	LEVEL_UP_MOVE(53, MOVE_TAILSLAP),
+	LEVEL_UP_MOVE(58, MOVE_SUPERPOWER),
+	LEVEL_UP_MOVE(63, MOVE_CURSE),
 	LEVEL_UP_END
 };
 
@@ -8092,16 +8194,17 @@ static const struct LevelUpMove sShinxLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_TACKLE),
 	LEVEL_UP_MOVE( 5, MOVE_LEER),
 	LEVEL_UP_MOVE( 9, MOVE_CHARGE),
-	LEVEL_UP_MOVE(11, MOVE_BABYDOLLEYES),
-	LEVEL_UP_MOVE(13, MOVE_SPARK),
-	LEVEL_UP_MOVE(17, MOVE_BITE),
-	LEVEL_UP_MOVE(21, MOVE_ROAR),
-	LEVEL_UP_MOVE(25, MOVE_SWAGGER),
-	LEVEL_UP_MOVE(29, MOVE_THUNDERFANG),
-	LEVEL_UP_MOVE(33, MOVE_CRUNCH),
-	LEVEL_UP_MOVE(37, MOVE_SCARYFACE),
-	LEVEL_UP_MOVE(41, MOVE_DISCHARGE),
-	LEVEL_UP_MOVE(45, MOVE_WILDCHARGE),
+	LEVEL_UP_MOVE(12, MOVE_BITE),
+	LEVEL_UP_MOVE(16, MOVE_SPARK),
+	LEVEL_UP_MOVE(20, MOVE_ROAR),
+	LEVEL_UP_MOVE(24, MOVE_VOLTSWITCH),
+	LEVEL_UP_MOVE(27, MOVE_SCARYFACE),
+	LEVEL_UP_MOVE(30, MOVE_THUNDERWAVE),
+	LEVEL_UP_MOVE(33, MOVE_THUNDERFANG),
+	LEVEL_UP_MOVE(36, MOVE_CRUNCH),
+	LEVEL_UP_MOVE(40, MOVE_WILDCHARGE),
+	LEVEL_UP_MOVE(43, MOVE_SWAGGER),
+	LEVEL_UP_MOVE(46, MOVE_VOLTTACKLE),
 	LEVEL_UP_END
 };
 
@@ -8110,15 +8213,17 @@ static const struct LevelUpMove sLuxioLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_LEER),
 	LEVEL_UP_MOVE( 5, MOVE_LEER),
 	LEVEL_UP_MOVE( 9, MOVE_CHARGE),
-	LEVEL_UP_MOVE(13, MOVE_SPARK),
-	LEVEL_UP_MOVE(18, MOVE_BITE),
-	LEVEL_UP_MOVE(23, MOVE_ROAR),
-	LEVEL_UP_MOVE(28, MOVE_SWAGGER),
-	LEVEL_UP_MOVE(33, MOVE_THUNDERFANG),
-	LEVEL_UP_MOVE(38, MOVE_CRUNCH),
-	LEVEL_UP_MOVE(43, MOVE_SCARYFACE),
-	LEVEL_UP_MOVE(48, MOVE_DISCHARGE),
-	LEVEL_UP_MOVE(53, MOVE_WILDCHARGE),
+	LEVEL_UP_MOVE(12, MOVE_BITE),
+	LEVEL_UP_MOVE(18, MOVE_SPARK),
+	LEVEL_UP_MOVE(22, MOVE_ROAR),
+	LEVEL_UP_MOVE(26, MOVE_VOLTSWITCH),
+	LEVEL_UP_MOVE(30, MOVE_SCARYFACE),
+	LEVEL_UP_MOVE(34, MOVE_THUNDERWAVE),
+	LEVEL_UP_MOVE(37, MOVE_THUNDERFANG),
+	LEVEL_UP_MOVE(41, MOVE_CRUNCH),
+	LEVEL_UP_MOVE(45, MOVE_WILDCHARGE),
+	LEVEL_UP_MOVE(49, MOVE_SWAGGER),
+	LEVEL_UP_MOVE(52, MOVE_VOLTTACKLE),
 	LEVEL_UP_END
 };
 
@@ -8129,16 +8234,17 @@ static const struct LevelUpMove sLuxrayLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_CHARGE),
 	LEVEL_UP_MOVE( 5, MOVE_LEER),
 	LEVEL_UP_MOVE( 9, MOVE_CHARGE),
-	LEVEL_UP_MOVE(13, MOVE_SPARK),
-	LEVEL_UP_MOVE(18, MOVE_BITE),
-	LEVEL_UP_MOVE(23, MOVE_ROAR),
-	LEVEL_UP_MOVE(28, MOVE_SWAGGER),
-	LEVEL_UP_MOVE(35, MOVE_THUNDERFANG),
-	LEVEL_UP_MOVE(42, MOVE_CRUNCH),
-	LEVEL_UP_MOVE(49, MOVE_SCARYFACE),
-	LEVEL_UP_MOVE(56, MOVE_DISCHARGE),
-	LEVEL_UP_MOVE(63, MOVE_WILDCHARGE),
-	LEVEL_UP_MOVE(67, MOVE_ELECTRICTERRAIN),
+	LEVEL_UP_MOVE(12, MOVE_BITE),
+	LEVEL_UP_MOVE(18, MOVE_SPARK),
+	LEVEL_UP_MOVE(22, MOVE_ROAR),
+	LEVEL_UP_MOVE(26, MOVE_VOLTSWITCH),
+	LEVEL_UP_MOVE(30, MOVE_SCARYFACE),
+	LEVEL_UP_MOVE(35, MOVE_THUNDERWAVE),
+	LEVEL_UP_MOVE(39, MOVE_THUNDERFANG),
+	LEVEL_UP_MOVE(44, MOVE_CRUNCH),
+	LEVEL_UP_MOVE(49, MOVE_WILDCHARGE),
+	LEVEL_UP_MOVE(54, MOVE_SWAGGER),
+	LEVEL_UP_MOVE(58, MOVE_VOLTTACKLE),
 	LEVEL_UP_END
 };
 
@@ -8217,7 +8323,7 @@ static const struct LevelUpMove sShieldonLevelUpLearnset[] = {
 
 static const struct LevelUpMove sBastiodonLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 0, MOVE_BLOCK),
-	LEVEL_UP_MOVE( 1, MOVE_BLOCK),
+	LEVEL_UP_MOVE( 1, MOVE_BEHEMOTHBASH),
 	LEVEL_UP_MOVE( 1, MOVE_TACKLE),
 	LEVEL_UP_MOVE( 1, MOVE_PROTECT),
 	LEVEL_UP_MOVE( 1, MOVE_TAUNT),
@@ -8245,7 +8351,7 @@ static const struct LevelUpMove sBurmyLevelUpLearnset[] = {
 
 static const struct LevelUpMove sWormadamLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 0, MOVE_QUIVERDANCE),
-	LEVEL_UP_MOVE( 1, MOVE_QUIVERDANCE),
+	LEVEL_UP_MOVE( 1, MOVE_ANCIENTPOWER),
 	LEVEL_UP_MOVE( 1, MOVE_SUCKERPUNCH),
 	LEVEL_UP_MOVE( 1, MOVE_TACKLE),
 	LEVEL_UP_MOVE( 1, MOVE_PROTECT),
@@ -8283,8 +8389,9 @@ static const struct LevelUpMove sMothimLevelUpLearnset[] = {
 	LEVEL_UP_MOVE(38, MOVE_SILVERWIND),
 	LEVEL_UP_MOVE(41, MOVE_AIRSLASH),
 	LEVEL_UP_MOVE(44, MOVE_PSYCHIC),
-	LEVEL_UP_MOVE(47, MOVE_LUNGE),
-	LEVEL_UP_MOVE(50, MOVE_BUGBUZZ),
+	LEVEL_UP_MOVE(47, MOVE_BUGBUZZ),
+	LEVEL_UP_MOVE(50, MOVE_LUNGE),
+	LEVEL_UP_MOVE(53, MOVE_HURRICANE),
 	LEVEL_UP_END
 };
 
@@ -8341,43 +8448,40 @@ static const struct LevelUpMove sPachirisuLevelUpLearnset[] = {
 };
 
 static const struct LevelUpMove sBuizelLevelUpLearnset[] = {
-	LEVEL_UP_MOVE( 1, MOVE_SONICBOOM),
+	LEVEL_UP_MOVE( 1, MOVE_WATERGUN),
 	LEVEL_UP_MOVE( 4, MOVE_GROWL),
 	LEVEL_UP_MOVE( 7, MOVE_WATERSPORT),
 	LEVEL_UP_MOVE(11, MOVE_QUICKATTACK),
-	LEVEL_UP_MOVE(15, MOVE_WATERGUN),
-	LEVEL_UP_MOVE(18, MOVE_PURSUIT),
-	LEVEL_UP_MOVE(21, MOVE_SWIFT),
-	LEVEL_UP_MOVE(24, MOVE_AQUAJET),
+	LEVEL_UP_MOVE(15, MOVE_AQUAJET),
+	LEVEL_UP_MOVE(19, MOVE_SONICBOOM),
+	LEVEL_UP_MOVE(23, MOVE_SWIFT),
 	LEVEL_UP_MOVE(27, MOVE_DOUBLEHIT),
-	LEVEL_UP_MOVE(31, MOVE_WHIRLPOOL),
-	LEVEL_UP_MOVE(35, MOVE_RAZORWIND),
-	LEVEL_UP_MOVE(38, MOVE_AQUATAIL),
-	LEVEL_UP_MOVE(41, MOVE_AGILITY),
-	LEVEL_UP_MOVE(45, MOVE_HYDROPUMP),
+	LEVEL_UP_MOVE(31, MOVE_TAILSLAP),
+	LEVEL_UP_MOVE(35, MOVE_AQUATAIL),
+	LEVEL_UP_MOVE(39, MOVE_RAZORWIND),
+	LEVEL_UP_MOVE(43, MOVE_AGILITY),
+	LEVEL_UP_MOVE(46, MOVE_HYDROPUMP),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sFloatzelLevelUpLearnset[] = {
+	LEVEL_UP_MOVE( 0, MOVE_FLIPTURN),
 	LEVEL_UP_MOVE( 1, MOVE_ICEFANG),
-	LEVEL_UP_MOVE( 1, MOVE_CRUNCH),
-	LEVEL_UP_MOVE( 1, MOVE_SONICBOOM),
+	LEVEL_UP_MOVE( 1, MOVE_TAILSLAP),
+	LEVEL_UP_MOVE( 1, MOVE_WATERGUN),
 	LEVEL_UP_MOVE( 1, MOVE_GROWL),
 	LEVEL_UP_MOVE( 1, MOVE_WATERSPORT),
 	LEVEL_UP_MOVE( 1, MOVE_QUICKATTACK),
-	LEVEL_UP_MOVE( 4, MOVE_GROWL),
-	LEVEL_UP_MOVE( 7, MOVE_WATERSPORT),
-	LEVEL_UP_MOVE(11, MOVE_QUICKATTACK),
-	LEVEL_UP_MOVE(15, MOVE_WATERGUN),
-	LEVEL_UP_MOVE(18, MOVE_PURSUIT),
-	LEVEL_UP_MOVE(21, MOVE_SWIFT),
-	LEVEL_UP_MOVE(24, MOVE_AQUAJET),
-	LEVEL_UP_MOVE(29, MOVE_DOUBLEHIT),
-	LEVEL_UP_MOVE(35, MOVE_WHIRLPOOL),
-	LEVEL_UP_MOVE(41, MOVE_RAZORWIND),
-	LEVEL_UP_MOVE(46, MOVE_AQUATAIL),
-	LEVEL_UP_MOVE(51, MOVE_AGILITY),
-	LEVEL_UP_MOVE(57, MOVE_HYDROPUMP),
+	LEVEL_UP_MOVE(15, MOVE_AQUAJET),
+	LEVEL_UP_MOVE(19, MOVE_SONICBOOM),
+	LEVEL_UP_MOVE(23, MOVE_SWIFT),
+	LEVEL_UP_MOVE(25, MOVE_FLIPTURN),
+	LEVEL_UP_MOVE(28, MOVE_DOUBLEHIT),
+	LEVEL_UP_MOVE(33, MOVE_CRUNCH),
+	LEVEL_UP_MOVE(38, MOVE_AQUATAIL),
+	LEVEL_UP_MOVE(43, MOVE_RAZORWIND),
+	LEVEL_UP_MOVE(48, MOVE_AGILITY),
+	LEVEL_UP_MOVE(52, MOVE_HYDROPUMP),
 	LEVEL_UP_END
 };
 
@@ -8499,15 +8603,18 @@ static const struct LevelUpMove sDrifblimLevelUpLearnset[] = {
 	LEVEL_UP_MOVE(13, MOVE_FOCUSENERGY),
 	LEVEL_UP_MOVE(16, MOVE_PAYBACK),
 	LEVEL_UP_MOVE(20, MOVE_OMINOUSWIND),
-	LEVEL_UP_MOVE(25, MOVE_STOCKPILE),
-	LEVEL_UP_MOVE(27, MOVE_HEX),
-	LEVEL_UP_MOVE(34, MOVE_SWALLOW),
-	LEVEL_UP_MOVE(34, MOVE_SPITUP),
-	LEVEL_UP_MOVE(40, MOVE_SHADOWBALL),
-	LEVEL_UP_MOVE(46, MOVE_AMNESIA),
-	LEVEL_UP_MOVE(52, MOVE_BATONPASS),
-	LEVEL_UP_MOVE(60, MOVE_EXPLOSION),
-	LEVEL_UP_MOVE(65, MOVE_PHANTOMFORCE),
+	LEVEL_UP_MOVE(24, MOVE_STOCKPILE),
+	LEVEL_UP_MOVE(24, MOVE_SWALLOW),
+	LEVEL_UP_MOVE(24, MOVE_SPITUP),
+	LEVEL_UP_MOVE(27, MOVE_PHANTOMFORCE),
+	LEVEL_UP_MOVE(28, MOVE_SELFDESTRUCT),
+	LEVEL_UP_MOVE(34, MOVE_TAILWIND),
+	LEVEL_UP_MOVE(38, MOVE_DESTINYBOND),
+	LEVEL_UP_MOVE(42, MOVE_SHADOWBALL),
+	LEVEL_UP_MOVE(47, MOVE_BATONPASS),
+	LEVEL_UP_MOVE(51, MOVE_AMNESIA),
+	LEVEL_UP_MOVE(55, MOVE_EXPLOSION),
+	LEVEL_UP_MOVE(59, MOVE_ASTRALBARRAGE),
 	LEVEL_UP_END
 };
 
@@ -8564,12 +8671,24 @@ static const struct LevelUpMove sMismagiusLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_MYSTICALFIRE),
 	LEVEL_UP_MOVE( 1, MOVE_POWERGEM),
 	LEVEL_UP_MOVE( 1, MOVE_PHANTOMFORCE),
-	LEVEL_UP_MOVE( 1, MOVE_LUCKYCHANT),
+	LEVEL_UP_MOVE( 1, MOVE_MOONGEISTBEAM),
 	LEVEL_UP_MOVE( 1, MOVE_MAGICALLEAF),
 	LEVEL_UP_MOVE( 1, MOVE_GROWL),
 	LEVEL_UP_MOVE( 1, MOVE_PSYWAVE),
 	LEVEL_UP_MOVE( 1, MOVE_SPITE),
 	LEVEL_UP_MOVE( 1, MOVE_ASTONISH),
+	LEVEL_UP_MOVE( 1, MOVE_MEANLOOK),
+	LEVEL_UP_MOVE( 1, MOVE_PSYBEAM),
+	LEVEL_UP_MOVE( 1, MOVE_PAINSPLIT),
+	LEVEL_UP_MOVE( 1, MOVE_PAYBACK),
+	LEVEL_UP_MOVE( 1, MOVE_SHADOWBALL),
+	LEVEL_UP_MOVE( 1, MOVE_POWERGEM),
+	LEVEL_UP_MOVE( 1, MOVE_GRUDGE),
+	LEVEL_UP_MOVE( 1, MOVE_PERISHSONG),
+	LEVEL_UP_MOVE( 1, MOVE_MYSTICALFIRE),
+	LEVEL_UP_MOVE( 1, MOVE_LUCKYCHANT),
+	LEVEL_UP_MOVE( 1, MOVE_CONFUSERAY),
+	LEVEL_UP_MOVE( 1, MOVE_HEX),
 	LEVEL_UP_END
 };
 
@@ -8577,15 +8696,21 @@ static const struct LevelUpMove sHonchkrowLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_NIGHTSLASH),
 	LEVEL_UP_MOVE( 1, MOVE_SUCKERPUNCH),
 	LEVEL_UP_MOVE( 1, MOVE_ASTONISH),
-	LEVEL_UP_MOVE( 1, MOVE_PURSUIT),
-	LEVEL_UP_MOVE( 1, MOVE_HAZE),
-	LEVEL_UP_MOVE( 1, MOVE_WINGATTACK),
-	LEVEL_UP_MOVE(25, MOVE_SWAGGER),
-	LEVEL_UP_MOVE(35, MOVE_NASTYPLOT),
-	LEVEL_UP_MOVE(45, MOVE_FOULPLAY),
-	LEVEL_UP_MOVE(55, MOVE_NIGHTSLASH),
-	LEVEL_UP_MOVE(65, MOVE_QUASH),
-	LEVEL_UP_MOVE(75, MOVE_DARKPULSE),
+	LEVEL_UP_MOVE( 5, MOVE_PURSUIT),
+	LEVEL_UP_MOVE(11, MOVE_HAZE),
+	LEVEL_UP_MOVE(15, MOVE_WINGATTACK),
+	LEVEL_UP_MOVE(21, MOVE_NIGHTSHADE),
+	LEVEL_UP_MOVE(25, MOVE_ASSURANCE),
+	LEVEL_UP_MOVE(30, MOVE_TAUNT),
+	LEVEL_UP_MOVE(34, MOVE_DRILLPECK),
+	LEVEL_UP_MOVE(39, MOVE_NIGHTSLASH),
+	LEVEL_UP_MOVE(44, MOVE_SWAGGER),
+	LEVEL_UP_MOVE(48, MOVE_SUCKERPUNCH),
+	LEVEL_UP_MOVE(53, MOVE_NASTYPLOT),
+	LEVEL_UP_MOVE(57, MOVE_DARKPULSE),
+	LEVEL_UP_MOVE(62, MOVE_OBLIVIONWING),
+	LEVEL_UP_MOVE(66, MOVE_QUASH),
+	LEVEL_UP_MOVE(70, MOVE_BRAVEBIRD),
 	LEVEL_UP_END
 };
 
@@ -8693,16 +8818,17 @@ static const struct LevelUpMove sBronzorLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 9, MOVE_IMPRISON),
 	LEVEL_UP_MOVE(11, MOVE_CONFUSERAY),
 	LEVEL_UP_MOVE(15, MOVE_PSYWAVE),
-	LEVEL_UP_MOVE(19, MOVE_IRONDEFENSE),
-	LEVEL_UP_MOVE(21, MOVE_FEINTATTACK),
-	LEVEL_UP_MOVE(25, MOVE_SAFEGUARD),
-	LEVEL_UP_MOVE(29, MOVE_FUTURESIGHT),
-	LEVEL_UP_MOVE(31, MOVE_METALSOUND),
-	LEVEL_UP_MOVE(35, MOVE_GYROBALL),
-	LEVEL_UP_MOVE(39, MOVE_EXTRASENSORY),
-	LEVEL_UP_MOVE(41, MOVE_PAYBACK),
-	LEVEL_UP_MOVE(45, MOVE_HEALBLOCK),
-	LEVEL_UP_MOVE(49, MOVE_HEAVYSLAM),
+	LEVEL_UP_MOVE(17, MOVE_GYROBALL),
+	LEVEL_UP_MOVE(20, MOVE_HYPNOSIS),
+	LEVEL_UP_MOVE(23, MOVE_FEINTATTACK),
+	LEVEL_UP_MOVE(26, MOVE_SAFEGUARD),
+	LEVEL_UP_MOVE(28, MOVE_EXTRASENSORY),
+	LEVEL_UP_MOVE(32, MOVE_HEALBLOCK),
+	LEVEL_UP_MOVE(36, MOVE_HEAVYSLAM),
+	LEVEL_UP_MOVE(40, MOVE_IRONDEFENSE),
+	LEVEL_UP_MOVE(44, MOVE_METALSOUND),
+	LEVEL_UP_MOVE(48, MOVE_FUTURESIGHT),
+	LEVEL_UP_MOVE(52, MOVE_DOOMDESIRE),
 	LEVEL_UP_END
 };
 
@@ -8719,16 +8845,18 @@ static const struct LevelUpMove sBronzongLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 9, MOVE_IMPRISON),
 	LEVEL_UP_MOVE(11, MOVE_CONFUSERAY),
 	LEVEL_UP_MOVE(15, MOVE_PSYWAVE),
-	LEVEL_UP_MOVE(19, MOVE_IRONDEFENSE),
-	LEVEL_UP_MOVE(21, MOVE_FEINTATTACK),
-	LEVEL_UP_MOVE(25, MOVE_SAFEGUARD),
-	LEVEL_UP_MOVE(29, MOVE_FUTURESIGHT),
-	LEVEL_UP_MOVE(31, MOVE_METALSOUND),
-	LEVEL_UP_MOVE(36, MOVE_GYROBALL),
-	LEVEL_UP_MOVE(42, MOVE_EXTRASENSORY),
-	LEVEL_UP_MOVE(46, MOVE_PAYBACK),
-	LEVEL_UP_MOVE(52, MOVE_HEALBLOCK),
-	LEVEL_UP_MOVE(58, MOVE_HEAVYSLAM),
+	LEVEL_UP_MOVE(17, MOVE_GYROBALL),
+	LEVEL_UP_MOVE(20, MOVE_HYPNOSIS),
+	LEVEL_UP_MOVE(23, MOVE_FEINTATTACK),
+	LEVEL_UP_MOVE(26, MOVE_SAFEGUARD),
+	LEVEL_UP_MOVE(28, MOVE_EXTRASENSORY),
+	LEVEL_UP_MOVE(32, MOVE_HEALBLOCK),
+	LEVEL_UP_MOVE(32, MOVE_BLOCK),
+	LEVEL_UP_MOVE(38, MOVE_HEAVYSLAM),
+	LEVEL_UP_MOVE(44, MOVE_IRONDEFENSE),
+	LEVEL_UP_MOVE(50, MOVE_METALSOUND),
+	LEVEL_UP_MOVE(56, MOVE_FUTURESIGHT),
+	LEVEL_UP_MOVE(62, MOVE_DOOMDESIRE),
 	LEVEL_UP_END
 };
 
@@ -8827,12 +8955,19 @@ static const struct LevelUpMove sGibleLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 3, MOVE_SANDATTACK),
 	LEVEL_UP_MOVE( 7, MOVE_DRAGONRAGE),
 	LEVEL_UP_MOVE(13, MOVE_SANDSTORM),
-	LEVEL_UP_MOVE(15, MOVE_TAKEDOWN),
-	LEVEL_UP_MOVE(19, MOVE_SANDTOMB),
-	LEVEL_UP_MOVE(25, MOVE_SLASH),
-	LEVEL_UP_MOVE(27, MOVE_DRAGONCLAW),
-	LEVEL_UP_MOVE(31, MOVE_DIG),
-	LEVEL_UP_MOVE(37, MOVE_DRAGONRUSH),
+	LEVEL_UP_MOVE(15, MOVE_SANDTOMB),
+	LEVEL_UP_MOVE(18, MOVE_METALCLAW),
+	LEVEL_UP_MOVE(21, MOVE_BITE),
+	LEVEL_UP_MOVE(24, MOVE_BULLDOZE),
+	LEVEL_UP_MOVE(27, MOVE_SLASH),
+	LEVEL_UP_MOVE(30, MOVE_DRAGONRAGE),
+	LEVEL_UP_MOVE(33, MOVE_TAKEDOWN),
+	LEVEL_UP_MOVE(36, MOVE_DIG),
+	LEVEL_UP_MOVE(39, MOVE_DRAGONCLAW),
+	LEVEL_UP_MOVE(42, MOVE_STOMPINGTANTRUM),
+	LEVEL_UP_MOVE(45, MOVE_DRAGONRUSH),
+	LEVEL_UP_MOVE(48, MOVE_EARTHQUAKE),
+	LEVEL_UP_MOVE(51, MOVE_OUTRAGE),
 	LEVEL_UP_END
 };
 
@@ -8841,16 +8976,22 @@ static const struct LevelUpMove sGabiteLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_DUALCHOP),
 	LEVEL_UP_MOVE( 1, MOVE_TACKLE),
 	LEVEL_UP_MOVE( 1, MOVE_SANDATTACK),
-	LEVEL_UP_MOVE( 1, MOVE_DRAGONRAGE),
-	LEVEL_UP_MOVE( 3, MOVE_SANDATTACK),
-	LEVEL_UP_MOVE( 7, MOVE_DRAGONRAGE),
-	LEVEL_UP_MOVE(13, MOVE_SANDSTORM),
-	LEVEL_UP_MOVE(15, MOVE_TAKEDOWN),
-	LEVEL_UP_MOVE(19, MOVE_SANDTOMB),
-	LEVEL_UP_MOVE(28, MOVE_SLASH),
-	LEVEL_UP_MOVE(33, MOVE_DRAGONCLAW),
-	LEVEL_UP_MOVE(40, MOVE_DIG),
-	LEVEL_UP_MOVE(49, MOVE_DRAGONRUSH),
+	LEVEL_UP_MOVE( 1, MOVE_FIREFANG),
+	LEVEL_UP_MOVE( 1, MOVE_SANDSTORM),
+	LEVEL_UP_MOVE(15, MOVE_SANDTOMB),
+	LEVEL_UP_MOVE(18, MOVE_METALCLAW),
+	LEVEL_UP_MOVE(21, MOVE_BITE),
+	LEVEL_UP_MOVE(23, MOVE_DUALCHOP),
+	LEVEL_UP_MOVE(24, MOVE_BULLDOZE),
+	LEVEL_UP_MOVE(29, MOVE_SLASH),
+	LEVEL_UP_MOVE(33, MOVE_DRAGONRAGE),
+	LEVEL_UP_MOVE(37, MOVE_TAKEDOWN),
+	LEVEL_UP_MOVE(41, MOVE_DIG),
+	LEVEL_UP_MOVE(44, MOVE_DRAGONCLAW),
+	LEVEL_UP_MOVE(47, MOVE_STOMPINGTANTRUM),
+	LEVEL_UP_MOVE(52, MOVE_DRAGONRUSH),
+	LEVEL_UP_MOVE(56, MOVE_EARTHQUAKE),
+	LEVEL_UP_MOVE(60, MOVE_OUTRAGE),
 	LEVEL_UP_END
 };
 
@@ -8863,18 +9004,50 @@ static const struct LevelUpMove sGarchompLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_SANDATTACK),
 	LEVEL_UP_MOVE( 1, MOVE_DRAGONRAGE),
 	LEVEL_UP_MOVE( 1, MOVE_SANDSTORM),
-	LEVEL_UP_MOVE( 3, MOVE_SANDATTACK),
-	LEVEL_UP_MOVE( 7, MOVE_DRAGONRAGE),
-	LEVEL_UP_MOVE(13, MOVE_SANDSTORM),
-	LEVEL_UP_MOVE(15, MOVE_TAKEDOWN),
-	LEVEL_UP_MOVE(19, MOVE_SANDTOMB),
-	LEVEL_UP_MOVE(28, MOVE_SLASH),
-	LEVEL_UP_MOVE(33, MOVE_DRAGONCLAW),
-	LEVEL_UP_MOVE(40, MOVE_DIG),
-	LEVEL_UP_MOVE(55, MOVE_DRAGONRUSH),
+	LEVEL_UP_MOVE(15, MOVE_SANDTOMB),
+	LEVEL_UP_MOVE(18, MOVE_METALCLAW),
+	LEVEL_UP_MOVE(21, MOVE_BITE),
+	LEVEL_UP_MOVE(23, MOVE_DUALCHOP),
+	LEVEL_UP_MOVE(24, MOVE_BULLDOZE),
+	LEVEL_UP_MOVE(29, MOVE_SLASH),
+	LEVEL_UP_MOVE(33, MOVE_DRAGONRAGE),
+	LEVEL_UP_MOVE(37, MOVE_TAKEDOWN),
+	LEVEL_UP_MOVE(41, MOVE_DIG),
+	LEVEL_UP_MOVE(44, MOVE_DRAGONCLAW),
+	LEVEL_UP_MOVE(47, MOVE_STOMPINGTANTRUM),
+	LEVEL_UP_MOVE(47, MOVE_CRUNCH),
+	LEVEL_UP_MOVE(57, MOVE_DRAGONRUSH),
+	LEVEL_UP_MOVE(63, MOVE_EARTHQUAKE),
+	LEVEL_UP_MOVE(69, MOVE_OUTRAGE),
 	LEVEL_UP_END
 };
 
+/*
+static const struct LevelUpMove sBGarchompLevelUpLearnset[] = {
+	LEVEL_UP_MOVE( 0, MOVE_CRUNCH),
+	LEVEL_UP_MOVE( 1, MOVE_TACKLE),
+	LEVEL_UP_MOVE( 1, MOVE_SANDATTACK),
+	LEVEL_UP_MOVE( 1, MOVE_FLAMEBURST),
+	LEVEL_UP_MOVE( 1, MOVE_SUNNYDAY),
+	LEVEL_UP_MOVE(15, MOVE_FLAMECHARGE),
+	LEVEL_UP_MOVE(18, MOVE_METALCLAW),
+	LEVEL_UP_MOVE(21, MOVE_BITE),
+	LEVEL_UP_MOVE(23, MOVE_DUALCHOP),
+	LEVEL_UP_MOVE(24, MOVE_TAKEDOWN),
+	LEVEL_UP_MOVE(29, MOVE_SLASH),
+	LEVEL_UP_MOVE(33, MOVE_FIREFANG),
+	LEVEL_UP_MOVE(37, MOVE_DRAGONRAGE),
+	LEVEL_UP_MOVE(41, MOVE_BLAZEKICK),
+	LEVEL_UP_MOVE(44, MOVE_DRAGONCLAW),
+	LEVEL_UP_MOVE(47, MOVE_SEARINGSHOT),
+	LEVEL_UP_MOVE(47, MOVE_CRUNCH),
+	LEVEL_UP_MOVE(57, MOVE_DRAGONRUSH),
+	LEVEL_UP_MOVE(63, MOVE_FLAREBLITZ),
+	LEVEL_UP_MOVE(69, MOVE_OUTRAGE),
+	LEVEL_UP_END
+};
+*/
+
 static const struct LevelUpMove sMunchlaxLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_LASTRESORT),
 	LEVEL_UP_MOVE( 1, MOVE_RECYCLE),
@@ -9199,9 +9372,7 @@ static const struct LevelUpMove sWeavileLevelUpLearnset[] = {
 };
 
 static const struct LevelUpMove sMagnezoneLevelUpLearnset[] = {
-	LEVEL_UP_MOVE( 1, MOVE_TRIATTACK),
-	LEVEL_UP_MOVE( 1, MOVE_ZAPCANNON),
-	LEVEL_UP_MOVE( 1, MOVE_MAGNETICFLUX),
+	LEVEL_UP_MOVE( 0, MOVE_MAGNETICFLUX),
 	LEVEL_UP_MOVE( 1, MOVE_MIRRORCOAT),
 	LEVEL_UP_MOVE( 1, MOVE_BARRIER),
 	LEVEL_UP_MOVE( 1, MOVE_ELECTRICTERRAIN),
@@ -9209,22 +9380,21 @@ static const struct LevelUpMove sMagnezoneLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_SUPERSONIC),
 	LEVEL_UP_MOVE( 1, MOVE_THUNDERSHOCK),
 	LEVEL_UP_MOVE( 1, MOVE_THUNDERWAVE),
-	LEVEL_UP_MOVE( 5, MOVE_THUNDERSHOCK),
-	LEVEL_UP_MOVE( 7, MOVE_THUNDERWAVE),
 	LEVEL_UP_MOVE(11, MOVE_MAGNETBOMB),
-	LEVEL_UP_MOVE(13, MOVE_LIGHTSCREEN),
+	LEVEL_UP_MOVE(14, MOVE_SPARK),
 	LEVEL_UP_MOVE(17, MOVE_SONICBOOM),
-	LEVEL_UP_MOVE(19, MOVE_SPARK),
-	LEVEL_UP_MOVE(23, MOVE_MIRRORSHOT),
-	LEVEL_UP_MOVE(25, MOVE_METALSOUND),
-	LEVEL_UP_MOVE(29, MOVE_ELECTROBALL),
-	LEVEL_UP_MOVE(33, MOVE_FLASHCANNON),
-	LEVEL_UP_MOVE(39, MOVE_SCREECH),
-	LEVEL_UP_MOVE(43, MOVE_DISCHARGE),
-	LEVEL_UP_MOVE(49, MOVE_LOCKON),
-	LEVEL_UP_MOVE(53, MOVE_MAGNETRISE),
-	LEVEL_UP_MOVE(59, MOVE_GYROBALL),
-	LEVEL_UP_MOVE(63, MOVE_ZAPCANNON),
+	LEVEL_UP_MOVE(20, MOVE_ELECTROBALL),
+	LEVEL_UP_MOVE(24, MOVE_SCREECH),
+	LEVEL_UP_MOVE(27, MOVE_MIRRORSHOT),
+	LEVEL_UP_MOVE(29, MOVE_TRIATTACK),
+	LEVEL_UP_MOVE(34, MOVE_MAGNETRISE),
+	LEVEL_UP_MOVE(39, MOVE_DISCHARGE),
+	LEVEL_UP_MOVE(44, MOVE_METALSOUND),
+	LEVEL_UP_MOVE(48, MOVE_FLASHCANNON),
+	LEVEL_UP_MOVE(53, MOVE_LIGHTSCREEN),
+	LEVEL_UP_MOVE(57, MOVE_GYROBALL),
+	LEVEL_UP_MOVE(62, MOVE_LOCKON),
+	LEVEL_UP_MOVE(66, MOVE_ZAPCANNON),
 	LEVEL_UP_END
 };
 
@@ -9349,8 +9519,29 @@ static const struct LevelUpMove sMagmortarLevelUpLearnset[] = {
 };
 
 static const struct LevelUpMove sTogekissLevelUpLearnset[] = {
-	LEVEL_UP_MOVE( 1, MOVE_AFTERYOU),
+	LEVEL_UP_MOVE( 0, MOVE_AIRSLASH),
 	LEVEL_UP_MOVE( 1, MOVE_SKYATTACK),
+	LEVEL_UP_MOVE( 1, MOVE_TRIATTACK),
+	LEVEL_UP_MOVE( 1, MOVE_MAGICALLEAF),
+	LEVEL_UP_MOVE( 1, MOVE_MYSTICALFIRE),
+	LEVEL_UP_MOVE( 1, MOVE_GROWL),
+	LEVEL_UP_MOVE( 1, MOVE_POUND),
+	LEVEL_UP_MOVE( 1, MOVE_SWEETKISS),
+	LEVEL_UP_MOVE( 1, MOVE_LIFEDEW),
+	LEVEL_UP_MOVE( 1, MOVE_CHARM),
+	LEVEL_UP_MOVE( 1, MOVE_ENCORE),
+	LEVEL_UP_MOVE( 1, MOVE_ANCIENTPOWER),
+	LEVEL_UP_MOVE( 1, MOVE_YAWN),
+	LEVEL_UP_MOVE( 1, MOVE_BESTOW),
+	LEVEL_UP_MOVE( 1, MOVE_METRONOME),
+	LEVEL_UP_MOVE( 1, MOVE_AFTERYOU),
+	LEVEL_UP_MOVE( 1, MOVE_DOUBLEEDGE),
+	LEVEL_UP_MOVE( 1, MOVE_SAFEGUARD),
+	LEVEL_UP_MOVE( 1, MOVE_FOLLOWME),
+	LEVEL_UP_MOVE( 1, MOVE_BATONPASS),
+	LEVEL_UP_MOVE( 1, MOVE_LASTRESORT),
+	LEVEL_UP_MOVE( 1, MOVE_WISH),
+	LEVEL_UP_MOVE( 1, MOVE_FAIRYWIND),
 	LEVEL_UP_MOVE( 1, MOVE_EXTREMESPEED),
 	LEVEL_UP_MOVE( 1, MOVE_AURASPHERE),
 	LEVEL_UP_MOVE( 1, MOVE_AIRSLASH),
@@ -9367,19 +9558,22 @@ static const struct LevelUpMove sYanmegaLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_QUICKATTACK),
 	LEVEL_UP_MOVE( 1, MOVE_DOUBLETEAM),
 	LEVEL_UP_MOVE( 6, MOVE_QUICKATTACK),
-	LEVEL_UP_MOVE(11, MOVE_DOUBLETEAM),
-	LEVEL_UP_MOVE(14, MOVE_SONICBOOM),
-	LEVEL_UP_MOVE(17, MOVE_DETECT),
-	LEVEL_UP_MOVE(22, MOVE_SUPERSONIC),
-	LEVEL_UP_MOVE(27, MOVE_UPROAR),
-	LEVEL_UP_MOVE(30, MOVE_PURSUIT),
+	LEVEL_UP_MOVE( 9, MOVE_SUPERSONIC),
+	LEVEL_UP_MOVE(12, MOVE_DOUBLETEAM),
+	LEVEL_UP_MOVE(15, MOVE_SONICBOOM),
+	LEVEL_UP_MOVE(19, MOVE_BUGBITE),
+	LEVEL_UP_MOVE(23, MOVE_DETECT),
+	LEVEL_UP_MOVE(27, MOVE_PURSUIT),
+	LEVEL_UP_MOVE(30, MOVE_SLASH),
+	LEVEL_UP_MOVE(32, MOVE_AIRCUTTER),
 	LEVEL_UP_MOVE(33, MOVE_ANCIENTPOWER),
-	LEVEL_UP_MOVE(38, MOVE_FEINT),
-	LEVEL_UP_MOVE(43, MOVE_SLASH),
-	LEVEL_UP_MOVE(46, MOVE_SCREECH),
-	LEVEL_UP_MOVE(49, MOVE_UTURN),
-	LEVEL_UP_MOVE(54, MOVE_AIRSLASH),
-	LEVEL_UP_MOVE(57, MOVE_BUGBUZZ),
+	LEVEL_UP_MOVE(37, MOVE_SILVERWIND),
+	LEVEL_UP_MOVE(41, MOVE_SCREECH),
+	LEVEL_UP_MOVE(45, MOVE_NIGHTSLASH),
+	LEVEL_UP_MOVE(49, MOVE_UPROAR),
+	LEVEL_UP_MOVE(53, MOVE_AIRSLASH),
+	LEVEL_UP_MOVE(57, MOVE_UTURN),
+	LEVEL_UP_MOVE(63, MOVE_BUGBUZZ),
 	LEVEL_UP_END
 };
 
@@ -9390,16 +9584,17 @@ static const struct LevelUpMove sLeafeonLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_TACKLE),
 	LEVEL_UP_MOVE( 1, MOVE_TAILWHIP),
 	LEVEL_UP_MOVE( 5, MOVE_SANDATTACK),
-	LEVEL_UP_MOVE( 9, MOVE_BABYDOLLEYES),
-	LEVEL_UP_MOVE(13, MOVE_QUICKATTACK),
-	LEVEL_UP_MOVE(17, MOVE_GRASSWHISTLE),
-	LEVEL_UP_MOVE(20, MOVE_MAGICALLEAF),
-	LEVEL_UP_MOVE(25, MOVE_GIGADRAIN),
-	LEVEL_UP_MOVE(29, MOVE_SWORDSDANCE),
-	LEVEL_UP_MOVE(33, MOVE_SYNTHESIS),
-	LEVEL_UP_MOVE(37, MOVE_SUNNYDAY),
-	LEVEL_UP_MOVE(41, MOVE_LASTRESORT),
-	LEVEL_UP_MOVE(45, MOVE_LEAFBLADE),
+	LEVEL_UP_MOVE(10, MOVE_QUICKATTACK),
+	LEVEL_UP_MOVE(15, MOVE_BABYDOLLEYES),
+	LEVEL_UP_MOVE(20, MOVE_LEECHSEED),
+	LEVEL_UP_MOVE(25, MOVE_MAGICALLEAF),
+	LEVEL_UP_MOVE(30, MOVE_SYNTHESIS),
+	LEVEL_UP_MOVE(35, MOVE_SUNNYDAY),
+	LEVEL_UP_MOVE(40, MOVE_GIGADRAIN),
+	LEVEL_UP_MOVE(45, MOVE_SWORDSDANCE),
+	LEVEL_UP_MOVE(50, MOVE_TROPKICK),
+	LEVEL_UP_MOVE(55, MOVE_LASTRESORT),
+	LEVEL_UP_MOVE(60, MOVE_LEAFBLADE),
 	LEVEL_UP_END
 };
 
@@ -9410,16 +9605,17 @@ static const struct LevelUpMove sGlaceonLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_TACKLE),
 	LEVEL_UP_MOVE( 1, MOVE_TAILWHIP),
 	LEVEL_UP_MOVE( 5, MOVE_SANDATTACK),
-	LEVEL_UP_MOVE( 9, MOVE_BABYDOLLEYES),
-	LEVEL_UP_MOVE(13, MOVE_QUICKATTACK),
-	LEVEL_UP_MOVE(17, MOVE_BITE),
-	LEVEL_UP_MOVE(20, MOVE_ICEFANG),
-	LEVEL_UP_MOVE(25, MOVE_ICESHARD),
-	LEVEL_UP_MOVE(29, MOVE_BARRIER),
-	LEVEL_UP_MOVE(33, MOVE_MIRRORCOAT),
-	LEVEL_UP_MOVE(37, MOVE_HAIL),
-	LEVEL_UP_MOVE(41, MOVE_LASTRESORT),
-	LEVEL_UP_MOVE(45, MOVE_BLIZZARD),
+	LEVEL_UP_MOVE(10, MOVE_QUICKATTACK),
+	LEVEL_UP_MOVE(15, MOVE_BABYDOLLEYES),
+	LEVEL_UP_MOVE(20, MOVE_ICESHARD),
+	LEVEL_UP_MOVE(25, MOVE_BITE),
+	LEVEL_UP_MOVE(30, MOVE_ICEFANG),
+	LEVEL_UP_MOVE(35, MOVE_HAIL),
+	LEVEL_UP_MOVE(40, MOVE_GLACIATE),
+	LEVEL_UP_MOVE(45, MOVE_MIRRORCOAT),
+	LEVEL_UP_MOVE(50, MOVE_FREEZEDRY),
+	LEVEL_UP_MOVE(55, MOVE_LASTRESORT),
+	LEVEL_UP_MOVE(60, MOVE_BLIZZARD),
 	LEVEL_UP_END
 };
 
@@ -9687,34 +9883,38 @@ static const struct LevelUpMove sAzelfLevelUpLearnset[] = {
 static const struct LevelUpMove sDialgaLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_DRAGONBREATH),
 	LEVEL_UP_MOVE( 1, MOVE_SCARYFACE),
-	LEVEL_UP_MOVE( 6, MOVE_METALCLAW),
-	LEVEL_UP_MOVE(10, MOVE_ANCIENTPOWER),
-	LEVEL_UP_MOVE(15, MOVE_SLASH),
-	LEVEL_UP_MOVE(19, MOVE_POWERGEM),
-	LEVEL_UP_MOVE(24, MOVE_METALBURST),
-	LEVEL_UP_MOVE(28, MOVE_DRAGONCLAW),
-	LEVEL_UP_MOVE(33, MOVE_EARTHPOWER),
-	LEVEL_UP_MOVE(37, MOVE_AURASPHERE),
-	LEVEL_UP_MOVE(42, MOVE_IRONTAIL),
-	LEVEL_UP_MOVE(46, MOVE_ROAROFTIME),
-	LEVEL_UP_MOVE(50, MOVE_FLASHCANNON),
+	LEVEL_UP_MOVE( 1, MOVE_METALCLAW),
+	LEVEL_UP_MOVE( 8, MOVE_DRAGONBREATH),
+	LEVEL_UP_MOVE(16, MOVE_ANCIENTPOWER),
+	LEVEL_UP_MOVE(24, MOVE_SLASH),
+	LEVEL_UP_MOVE(32, MOVE_FLASHCANNON),
+	LEVEL_UP_MOVE(40, MOVE_DRAGONCLAW),
+	LEVEL_UP_MOVE(48, MOVE_AURASPHERE),
+	LEVEL_UP_MOVE(56, MOVE_POWERGEM),
+	LEVEL_UP_MOVE(64, MOVE_METALBURST),
+	LEVEL_UP_MOVE(72, MOVE_EARTHPOWER),
+	LEVEL_UP_MOVE(80, MOVE_CLANGINGSCALES),
+	LEVEL_UP_MOVE(88, MOVE_IRONTAIL),
+	LEVEL_UP_MOVE(96, MOVE_ROAROFTIME),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sPalkiaLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_DRAGONBREATH),
 	LEVEL_UP_MOVE( 1, MOVE_SCARYFACE),
-	LEVEL_UP_MOVE( 6, MOVE_WATERPULSE),
-	LEVEL_UP_MOVE(10, MOVE_ANCIENTPOWER),
-	LEVEL_UP_MOVE(15, MOVE_SLASH),
-	LEVEL_UP_MOVE(19, MOVE_POWERGEM),
-	LEVEL_UP_MOVE(24, MOVE_AQUARING),
-	LEVEL_UP_MOVE(28, MOVE_DRAGONCLAW),
-	LEVEL_UP_MOVE(33, MOVE_EARTHPOWER),
-	LEVEL_UP_MOVE(37, MOVE_AURASPHERE),
-	LEVEL_UP_MOVE(42, MOVE_AQUATAIL),
-	LEVEL_UP_MOVE(46, MOVE_SPACIALREND),
-	LEVEL_UP_MOVE(50, MOVE_HYDROPUMP),
+	LEVEL_UP_MOVE( 1, MOVE_WATERPULSE),
+	LEVEL_UP_MOVE( 8, MOVE_DRAGONBREATH),
+	LEVEL_UP_MOVE(16, MOVE_ANCIENTPOWER),
+	LEVEL_UP_MOVE(24, MOVE_SLASH),
+	LEVEL_UP_MOVE(32, MOVE_AQUARING),
+	LEVEL_UP_MOVE(40, MOVE_DRAGONCLAW),
+	LEVEL_UP_MOVE(48, MOVE_AURASPHERE),
+	LEVEL_UP_MOVE(56, MOVE_POWERGEM),
+	LEVEL_UP_MOVE(64, MOVE_AQUATAIL),
+	LEVEL_UP_MOVE(72, MOVE_EARTHPOWER),
+	LEVEL_UP_MOVE(80, MOVE_SPACIALREND),
+	LEVEL_UP_MOVE(88, MOVE_HYDROPUMP),
+	LEVEL_UP_MOVE(96, MOVE_ORIGINPULSE),
 	LEVEL_UP_END
 };
 
@@ -9848,6 +10048,7 @@ static const struct LevelUpMove sDarkraiLevelUpLearnset[] = {
 
 static const struct LevelUpMove sShayminLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_GROWTH),
+	LEVEL_UP_MOVE( 5, MOVE_FLORALHEALING),
 	LEVEL_UP_MOVE(10, MOVE_MAGICALLEAF),
 	LEVEL_UP_MOVE(19, MOVE_LEECHSEED),
 	LEVEL_UP_MOVE(28, MOVE_SYNTHESIS),
@@ -10100,21 +10301,22 @@ static const struct LevelUpMove sSamurottLevelUpLearnset[] = {
 static const struct LevelUpMove sPatratLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_TACKLE),
 	LEVEL_UP_MOVE( 3, MOVE_LEER),
-	LEVEL_UP_MOVE( 6, MOVE_BITE),
-	LEVEL_UP_MOVE( 8, MOVE_BIDE),
-	LEVEL_UP_MOVE(11, MOVE_DETECT),
-	LEVEL_UP_MOVE(13, MOVE_SANDATTACK),
-	LEVEL_UP_MOVE(16, MOVE_CRUNCH),
+	LEVEL_UP_MOVE( 6, MOVE_PURSUIT),
+	LEVEL_UP_MOVE( 8, MOVE_SANDATTACK),
+	LEVEL_UP_MOVE(10, MOVE_COVET),
+	LEVEL_UP_MOVE(13, MOVE_DETECT),
+	LEVEL_UP_MOVE(15, MOVE_BITE),
 	LEVEL_UP_MOVE(18, MOVE_HYPNOSIS),
-	LEVEL_UP_MOVE(21, MOVE_SUPERFANG),
-	LEVEL_UP_MOVE(23, MOVE_AFTERYOU),
-	LEVEL_UP_MOVE(26, MOVE_FOCUSENERGY),
+	LEVEL_UP_MOVE(20, MOVE_SLAM),
+	LEVEL_UP_MOVE(23, MOVE_FOCUSENERGY),
+	LEVEL_UP_MOVE(25, MOVE_CRUNCH),
 	LEVEL_UP_MOVE(28, MOVE_WORKUP),
-	LEVEL_UP_MOVE(31, MOVE_HYPERFANG),
-	LEVEL_UP_MOVE(33, MOVE_NASTYPLOT),
-	LEVEL_UP_MOVE(36, MOVE_MEANLOOK),
-	LEVEL_UP_MOVE(38, MOVE_BATONPASS),
-	LEVEL_UP_MOVE(41, MOVE_SLAM),
+	LEVEL_UP_MOVE(30, MOVE_AFTERYOU),
+	LEVEL_UP_MOVE(32, MOVE_HYPERFANG),
+	LEVEL_UP_MOVE(35, MOVE_NASTYPLOT),
+	LEVEL_UP_MOVE(37, MOVE_MEANLOOK),
+	LEVEL_UP_MOVE(39, MOVE_BATONPASS),
+	LEVEL_UP_MOVE(42, MOVE_SUPERFANG),
 	LEVEL_UP_END
 };
 
@@ -10124,24 +10326,24 @@ static const struct LevelUpMove sWatchogLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_ROTOTILLER),
 	LEVEL_UP_MOVE( 1, MOVE_TACKLE),
 	LEVEL_UP_MOVE( 1, MOVE_LEER),
-	LEVEL_UP_MOVE( 1, MOVE_BITE),
-	LEVEL_UP_MOVE( 1, MOVE_LOWKICK),
-	LEVEL_UP_MOVE( 3, MOVE_LEER),
-	LEVEL_UP_MOVE( 6, MOVE_BITE),
-	LEVEL_UP_MOVE( 8, MOVE_BIDE),
-	LEVEL_UP_MOVE(11, MOVE_DETECT),
-	LEVEL_UP_MOVE(13, MOVE_SANDATTACK),
-	LEVEL_UP_MOVE(16, MOVE_CRUNCH),
+	LEVEL_UP_MOVE( 1, MOVE_PURSUIT),
+	LEVEL_UP_MOVE( 8, MOVE_SANDATTACK),
+	LEVEL_UP_MOVE(10, MOVE_COVET),
+	LEVEL_UP_MOVE(13, MOVE_DETECT),
+	LEVEL_UP_MOVE(15, MOVE_BITE),
 	LEVEL_UP_MOVE(18, MOVE_HYPNOSIS),
-	LEVEL_UP_MOVE(22, MOVE_SUPERFANG),
-	LEVEL_UP_MOVE(25, MOVE_AFTERYOU),
-	LEVEL_UP_MOVE(29, MOVE_FOCUSENERGY),
-	LEVEL_UP_MOVE(32, MOVE_PSYCHUP),
-	LEVEL_UP_MOVE(36, MOVE_HYPERFANG),
-	LEVEL_UP_MOVE(39, MOVE_NASTYPLOT),
-	LEVEL_UP_MOVE(43, MOVE_MEANLOOK),
-	LEVEL_UP_MOVE(46, MOVE_BATONPASS),
-	LEVEL_UP_MOVE(50, MOVE_SLAM),
+	LEVEL_UP_MOVE(20, MOVE_SLAM),
+	LEVEL_UP_MOVE(19, MOVE_CONFUSERAY),
+	LEVEL_UP_MOVE(24, MOVE_FOCUSENERGY),
+	LEVEL_UP_MOVE(27, MOVE_CRUNCH),
+	LEVEL_UP_MOVE(31, MOVE_WORKUP),
+	LEVEL_UP_MOVE(34, MOVE_AFTERYOU),
+	LEVEL_UP_MOVE(37, MOVE_HYPERFANG),
+	LEVEL_UP_MOVE(41, MOVE_PSYCHUP),
+	LEVEL_UP_MOVE(44, MOVE_NASTYPLOT),
+	LEVEL_UP_MOVE(47, MOVE_MEANLOOK),
+	LEVEL_UP_MOVE(50, MOVE_BATONPASS),
+	LEVEL_UP_MOVE(53, MOVE_SUPERFANG),
 	LEVEL_UP_END
 };
 
@@ -10442,7 +10644,9 @@ static const struct LevelUpMove sBlitzleLevelUpLearnset[] = {
 	LEVEL_UP_MOVE(32, MOVE_DISCHARGE),
 	LEVEL_UP_MOVE(36, MOVE_AGILITY),
 	LEVEL_UP_MOVE(39, MOVE_WILDCHARGE),
-	LEVEL_UP_MOVE(43, MOVE_THRASH),
+	LEVEL_UP_MOVE(43, MOVE_THUNDEROUSKICK),
+	LEVEL_UP_MOVE(47, MOVE_THRASH),
+	LEVEL_UP_MOVE(51, MOVE_VOLTTACKLE),
 	LEVEL_UP_END
 };
 
@@ -10451,10 +10655,7 @@ static const struct LevelUpMove sZebstrikaLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_QUICKATTACK),
 	LEVEL_UP_MOVE( 1, MOVE_TAILWHIP),
 	LEVEL_UP_MOVE( 1, MOVE_CHARGE),
-	LEVEL_UP_MOVE( 1, MOVE_THUNDERWAVE),
-	LEVEL_UP_MOVE( 4, MOVE_TAILWHIP),
-	LEVEL_UP_MOVE( 8, MOVE_CHARGE),
-	LEVEL_UP_MOVE(11, MOVE_SHOCKWAVE),
+	LEVEL_UP_MOVE( 1, MOVE_SHOCKWAVE),
 	LEVEL_UP_MOVE(15, MOVE_THUNDERWAVE),
 	LEVEL_UP_MOVE(18, MOVE_FLAMECHARGE),
 	LEVEL_UP_MOVE(22, MOVE_PURSUIT),
@@ -10463,8 +10664,10 @@ static const struct LevelUpMove sZebstrikaLevelUpLearnset[] = {
 	LEVEL_UP_MOVE(36, MOVE_DISCHARGE),
 	LEVEL_UP_MOVE(42, MOVE_AGILITY),
 	LEVEL_UP_MOVE(47, MOVE_WILDCHARGE),
-	LEVEL_UP_MOVE(53, MOVE_THRASH),
-	LEVEL_UP_MOVE(58, MOVE_IONDELUGE),
+	LEVEL_UP_MOVE(53, MOVE_THUNDEROUSKICK),
+	LEVEL_UP_MOVE(58, MOVE_THRASH),
+	LEVEL_UP_MOVE(63, MOVE_FLAREBLITZ),
+	LEVEL_UP_MOVE(68, MOVE_VOLTTACKLE),
 	LEVEL_UP_END
 };
 
@@ -10615,23 +10818,24 @@ static const struct LevelUpMove sAudinoLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_HYPERVOICE),
 	LEVEL_UP_MOVE( 1, MOVE_MISTYTERRAIN),
 	LEVEL_UP_MOVE( 1, MOVE_PLAYNICE),
-	LEVEL_UP_MOVE( 1, MOVE_POUND),
-	LEVEL_UP_MOVE( 1, MOVE_GROWL),
-	LEVEL_UP_MOVE( 1, MOVE_HELPINGHAND),
-	LEVEL_UP_MOVE( 5, MOVE_BABYDOLLEYES),
-	LEVEL_UP_MOVE( 9, MOVE_REFRESH),
-	LEVEL_UP_MOVE(13, MOVE_DISARMINGVOICE),
-	LEVEL_UP_MOVE(17, MOVE_DOUBLESLAP),
-	LEVEL_UP_MOVE(21, MOVE_ATTRACT),
-	LEVEL_UP_MOVE(25, MOVE_SECRETPOWER),
-	LEVEL_UP_MOVE(29, MOVE_ENTRAINMENT),
-	LEVEL_UP_MOVE(33, MOVE_TAKEDOWN),
-	LEVEL_UP_MOVE(37, MOVE_HEALPULSE),
-	LEVEL_UP_MOVE(41, MOVE_AFTERYOU),
-	LEVEL_UP_MOVE(45, MOVE_SIMPLEBEAM),
-	LEVEL_UP_MOVE(49, MOVE_DOUBLEEDGE),
-	LEVEL_UP_MOVE(53, MOVE_HYPERVOICE),
-	LEVEL_UP_MOVE(57, MOVE_LASTRESORT),
+	LEVEL_UP_MOVE( 4, MOVE_DISARMINGVOICE),
+	LEVEL_UP_MOVE( 9, MOVE_BABYDOLLEYES),
+	LEVEL_UP_MOVE(12, MOVE_HELPINGHAND),
+	LEVEL_UP_MOVE(16, MOVE_GROWL),
+	LEVEL_UP_MOVE(19, MOVE_SECRETPOWER),
+	LEVEL_UP_MOVE(23, MOVE_REFRESH),
+	LEVEL_UP_MOVE(26, MOVE_ZENHEADBUTT),
+	LEVEL_UP_MOVE(30, MOVE_LIFEDEW),
+	LEVEL_UP_MOVE(33, MOVE_AFTERYOU),
+	LEVEL_UP_MOVE(36, MOVE_TAKEDOWN),
+	LEVEL_UP_MOVE(40, MOVE_SIMPLEBEAM),
+	LEVEL_UP_MOVE(44, MOVE_HYPERVOICE),
+	LEVEL_UP_MOVE(48, MOVE_HEALPULSE),
+	LEVEL_UP_MOVE(51, MOVE_DECORATE),
+	LEVEL_UP_MOVE(54, MOVE_DOUBLEEDGE),
+	LEVEL_UP_MOVE(58, MOVE_ENTRAINMENT),
+	LEVEL_UP_MOVE(61, MOVE_MISTYTERRAIN),
+	LEVEL_UP_MOVE(64, MOVE_LASTRESORT),
 	LEVEL_UP_END
 };
 
@@ -10762,64 +10966,70 @@ static const struct LevelUpMove sSeismitoadLevelUpLearnset[] = {
 
 static const struct LevelUpMove sThrohLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_MATBLOCK),
+	LEVEL_UP_MOVE( 1, MOVE_RECOVER),
+	LEVEL_UP_MOVE( 1, MOVE_BIDE),
 	LEVEL_UP_MOVE( 1, MOVE_BIND),
 	LEVEL_UP_MOVE( 1, MOVE_LEER),
-	LEVEL_UP_MOVE( 1, MOVE_BIDE),
 	LEVEL_UP_MOVE( 1, MOVE_FOCUSENERGY),
-	LEVEL_UP_MOVE( 5, MOVE_SEISMICTOSS),
-	LEVEL_UP_MOVE( 9, MOVE_VITALTHROW),
-	LEVEL_UP_MOVE(13, MOVE_REVENGE),
-	LEVEL_UP_MOVE(17, MOVE_STORMTHROW),
-	LEVEL_UP_MOVE(21, MOVE_BODYSLAM),
-	LEVEL_UP_MOVE(25, MOVE_BULKUP),
-	LEVEL_UP_MOVE(29, MOVE_CIRCLETHROW),
-	LEVEL_UP_MOVE(33, MOVE_ENDURE),
-	LEVEL_UP_MOVE(37, MOVE_WIDEGUARD),
-	LEVEL_UP_MOVE(41, MOVE_SUPERPOWER),
-	LEVEL_UP_MOVE(45, MOVE_REVERSAL),
+	LEVEL_UP_MOVE( 9, MOVE_CIRCLETHROW),
+	LEVEL_UP_MOVE(14, MOVE_WIDEGUARD),
+	LEVEL_UP_MOVE(18, MOVE_REVENGE),
+	LEVEL_UP_MOVE(23, MOVE_BULKUP),
+	LEVEL_UP_MOVE(27, MOVE_BODYSLAM),
+	LEVEL_UP_MOVE(32, MOVE_VITALTHROW),
+	LEVEL_UP_MOVE(37, MOVE_SEISMICTOSS),
+	LEVEL_UP_MOVE(42, MOVE_STORMTHROW),
+	LEVEL_UP_MOVE(47, MOVE_ENDURE),
+	LEVEL_UP_MOVE(51, MOVE_REVERSAL),
+	LEVEL_UP_MOVE(56, MOVE_SUPERPOWER),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sSawkLevelUpLearnset[] = {
+	LEVEL_UP_MOVE( 1, MOVE_BIDE),
 	LEVEL_UP_MOVE( 1, MOVE_ROCKSMASH),
 	LEVEL_UP_MOVE( 1, MOVE_LEER),
-	LEVEL_UP_MOVE( 1, MOVE_BIDE),
 	LEVEL_UP_MOVE( 1, MOVE_FOCUSENERGY),
-	LEVEL_UP_MOVE( 5, MOVE_DOUBLEKICK),
-	LEVEL_UP_MOVE( 9, MOVE_LOWSWEEP),
-	LEVEL_UP_MOVE(13, MOVE_COUNTER),
-	LEVEL_UP_MOVE(17, MOVE_KARATECHOP),
-	LEVEL_UP_MOVE(21, MOVE_BRICKBREAK),
-	LEVEL_UP_MOVE(25, MOVE_BULKUP),
-	LEVEL_UP_MOVE(29, MOVE_RETALIATE),
-	LEVEL_UP_MOVE(33, MOVE_ENDURE),
-	LEVEL_UP_MOVE(37, MOVE_QUICKGUARD),
-	LEVEL_UP_MOVE(41, MOVE_CLOSECOMBAT),
-	LEVEL_UP_MOVE(45, MOVE_REVERSAL),
+	LEVEL_UP_MOVE( 9, MOVE_KARATECHOP),
+	LEVEL_UP_MOVE(14, MOVE_QUICKGUARD),
+	LEVEL_UP_MOVE(18, MOVE_LOWSWEEP),
+	LEVEL_UP_MOVE(23, MOVE_BULKUP),
+	LEVEL_UP_MOVE(27, MOVE_RETALIATE),
+	LEVEL_UP_MOVE(32, MOVE_DOUBLEKICK),
+	LEVEL_UP_MOVE(37, MOVE_BRICKBREAK),
+	LEVEL_UP_MOVE(42, MOVE_COUNTER),
+	LEVEL_UP_MOVE(47, MOVE_ENDURE),
+	LEVEL_UP_MOVE(51, MOVE_REVERSAL),
+	LEVEL_UP_MOVE(56, MOVE_CLOSECOMBAT),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sSewaddleLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_TACKLE),
 	LEVEL_UP_MOVE( 1, MOVE_STRINGSHOT),
-	LEVEL_UP_MOVE( 8, MOVE_BUGBITE),
-	LEVEL_UP_MOVE(15, MOVE_RAZORLEAF),
-	LEVEL_UP_MOVE(22, MOVE_STRUGGLEBUG),
-	LEVEL_UP_MOVE(29, MOVE_ENDURE),
-	LEVEL_UP_MOVE(31, MOVE_STICKYWEB),
-	LEVEL_UP_MOVE(36, MOVE_BUGBUZZ),
-	LEVEL_UP_MOVE(43, MOVE_FLAIL),
+	LEVEL_UP_MOVE( 8, MOVE_STRUGGLEBUG),
+	LEVEL_UP_MOVE(11, MOVE_RAZORLEAF),
+	LEVEL_UP_MOVE(14, MOVE_BUGBITE),
+	LEVEL_UP_MOVE(17, MOVE_STICKYWEB),
+	LEVEL_UP_MOVE(19, MOVE_ENDURE),
+	LEVEL_UP_MOVE(21, MOVE_FLAIL),
+	LEVEL_UP_MOVE(24, MOVE_BUGBUZZ),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sSwadloonLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 0, MOVE_PROTECT),
-	LEVEL_UP_MOVE( 1, MOVE_PROTECT),
-	LEVEL_UP_MOVE( 1, MOVE_GRASSWHISTLE),
 	LEVEL_UP_MOVE( 1, MOVE_TACKLE),
 	LEVEL_UP_MOVE( 1, MOVE_STRINGSHOT),
-	LEVEL_UP_MOVE( 1, MOVE_BUGBITE),
+	LEVEL_UP_MOVE( 1, MOVE_STRUGGLEBUG),
+	LEVEL_UP_MOVE( 1, MOVE_STICKYWEB),
+	LEVEL_UP_MOVE( 1, MOVE_ENDURE),
+	LEVEL_UP_MOVE( 1, MOVE_FLAIL),
+	LEVEL_UP_MOVE( 1, MOVE_BUGBUZZ),
+	LEVEL_UP_MOVE( 1, MOVE_PROTECT),
+	LEVEL_UP_MOVE( 1, MOVE_GRASSWHISTLE),
 	LEVEL_UP_MOVE( 1, MOVE_RAZORLEAF),
+	LEVEL_UP_MOVE( 1, MOVE_BUGBITE),
 	LEVEL_UP_END
 };
 
@@ -10827,39 +11037,45 @@ static const struct LevelUpMove sLeavannyLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 0, MOVE_SLASH),
 	LEVEL_UP_MOVE( 1, MOVE_SLASH),
 	LEVEL_UP_MOVE( 1, MOVE_FALSESWIPE),
+	LEVEL_UP_MOVE( 1, MOVE_LEAFSTORM),
+	LEVEL_UP_MOVE( 1, MOVE_STICKYWEB),
+	LEVEL_UP_MOVE( 1, MOVE_ENDURE),
+	LEVEL_UP_MOVE( 1, MOVE_FLAIL),
+	LEVEL_UP_MOVE( 1, MOVE_BUGBUZZ),
+	LEVEL_UP_MOVE( 1, MOVE_PROTECT),
+	LEVEL_UP_MOVE( 1, MOVE_GRASSWHISTLE),
 	LEVEL_UP_MOVE( 1, MOVE_TACKLE),
 	LEVEL_UP_MOVE( 1, MOVE_STRINGSHOT),
-	LEVEL_UP_MOVE( 1, MOVE_BUGBITE),
+	LEVEL_UP_MOVE( 1, MOVE_STRUGGLEBUG),
 	LEVEL_UP_MOVE( 1, MOVE_RAZORLEAF),
-	LEVEL_UP_MOVE( 8, MOVE_BUGBITE),
-	LEVEL_UP_MOVE(15, MOVE_RAZORLEAF),
-	LEVEL_UP_MOVE(22, MOVE_STRUGGLEBUG),
-	LEVEL_UP_MOVE(29, MOVE_FELLSTINGER),
-	LEVEL_UP_MOVE(32, MOVE_HELPINGHAND),
-	LEVEL_UP_MOVE(36, MOVE_LEAFBLADE),
-	LEVEL_UP_MOVE(39, MOVE_XSCISSOR),
-	LEVEL_UP_MOVE(43, MOVE_ENTRAINMENT),
+	LEVEL_UP_MOVE(14, MOVE_BUGBITE),
+	LEVEL_UP_MOVE(20, MOVE_SLASH),
+	LEVEL_UP_MOVE(24, MOVE_FELLSTINGER),
+	LEVEL_UP_MOVE(28, MOVE_ENTRAINMENT),
+	LEVEL_UP_MOVE(31, MOVE_HELPINGHAND),
+	LEVEL_UP_MOVE(34, MOVE_LEAFBLADE),
+	LEVEL_UP_MOVE(38, MOVE_XSCISSOR),
+	LEVEL_UP_MOVE(42, MOVE_THROATCHOP),
 	LEVEL_UP_MOVE(46, MOVE_SWORDSDANCE),
-	LEVEL_UP_MOVE(50, MOVE_LEAFSTORM),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sVenipedeLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_DEFENSECURL),
-	LEVEL_UP_MOVE( 1, MOVE_ROLLOUT),
-	LEVEL_UP_MOVE( 5, MOVE_POISONSTING),
-	LEVEL_UP_MOVE( 8, MOVE_SCREECH),
-	LEVEL_UP_MOVE(12, MOVE_PURSUIT),
-	LEVEL_UP_MOVE(15, MOVE_PROTECT),
-	LEVEL_UP_MOVE(19, MOVE_POISONTAIL),
-	LEVEL_UP_MOVE(22, MOVE_BUGBITE),
-	LEVEL_UP_MOVE(26, MOVE_VENOSHOCK),
-	LEVEL_UP_MOVE(29, MOVE_AGILITY),
-	LEVEL_UP_MOVE(33, MOVE_STEAMROLLER),
-	LEVEL_UP_MOVE(36, MOVE_TOXIC),
-	LEVEL_UP_MOVE(38, MOVE_VENOMDRENCH),
-	LEVEL_UP_MOVE(40, MOVE_ROCKCLIMB),
-	LEVEL_UP_MOVE(43, MOVE_DOUBLEEDGE),
+	LEVEL_UP_MOVE( 4, MOVE_ROLLOUT),
+	LEVEL_UP_MOVE( 8, MOVE_PROTECT),
+	LEVEL_UP_MOVE(12, MOVE_POISONTAIL),
+	LEVEL_UP_MOVE(16, MOVE_SCREECH),
+	LEVEL_UP_MOVE(19, MOVE_STEAMROLLER),
+	LEVEL_UP_MOVE(23, MOVE_VENOSHOCK),
+	LEVEL_UP_MOVE(27, MOVE_TAKEDOWN),
+	LEVEL_UP_MOVE(31, MOVE_BUGBITE),
+	LEVEL_UP_MOVE(35, MOVE_AGILITY),
+	LEVEL_UP_MOVE(38, MOVE_POISONJAB),
+	LEVEL_UP_MOVE(42, MOVE_TOXIC),
+	LEVEL_UP_MOVE(45, MOVE_ROCKCLIMB),
+	LEVEL_UP_MOVE(49, MOVE_VENOMDRENCH),
+	LEVEL_UP_MOVE(52, MOVE_DOUBLEEDGE),
 	LEVEL_UP_END
 };
 
@@ -10868,47 +11084,46 @@ static const struct LevelUpMove sWhirlipedeLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_IRONDEFENSE),
 	LEVEL_UP_MOVE( 1, MOVE_DEFENSECURL),
 	LEVEL_UP_MOVE( 1, MOVE_ROLLOUT),
-	LEVEL_UP_MOVE( 1, MOVE_POISONSTING),
-	LEVEL_UP_MOVE( 1, MOVE_SCREECH),
-	LEVEL_UP_MOVE( 5, MOVE_POISONSTING),
-	LEVEL_UP_MOVE( 8, MOVE_SCREECH),
-	LEVEL_UP_MOVE(12, MOVE_PURSUIT),
-	LEVEL_UP_MOVE(15, MOVE_PROTECT),
-	LEVEL_UP_MOVE(19, MOVE_POISONTAIL),
-	LEVEL_UP_MOVE(23, MOVE_BUGBITE),
-	LEVEL_UP_MOVE(28, MOVE_VENOSHOCK),
-	LEVEL_UP_MOVE(32, MOVE_AGILITY),
-	LEVEL_UP_MOVE(37, MOVE_STEAMROLLER),
-	LEVEL_UP_MOVE(41, MOVE_TOXIC),
-	LEVEL_UP_MOVE(43, MOVE_VENOMDRENCH),
-	LEVEL_UP_MOVE(46, MOVE_ROCKCLIMB),
-	LEVEL_UP_MOVE(50, MOVE_DOUBLEEDGE),
+	LEVEL_UP_MOVE( 1, MOVE_PROTECT),
+	LEVEL_UP_MOVE(12, MOVE_POISONTAIL),
+	LEVEL_UP_MOVE(16, MOVE_SCREECH),
+	LEVEL_UP_MOVE(19, MOVE_STEAMROLLER),
+	LEVEL_UP_MOVE(21, MOVE_IRONDEFENSE),
+	LEVEL_UP_MOVE(25, MOVE_VENOSHOCK),
+	LEVEL_UP_MOVE(30, MOVE_TAKEDOWN),
+	LEVEL_UP_MOVE(35, MOVE_BUGBITE),
+	LEVEL_UP_MOVE(40, MOVE_AGILITY),
+	LEVEL_UP_MOVE(44, MOVE_POISONJAB),
+	LEVEL_UP_MOVE(49, MOVE_TOXIC),
+	LEVEL_UP_MOVE(53, MOVE_ROCKCLIMB),
+	LEVEL_UP_MOVE(58, MOVE_VENOMDRENCH),
+	LEVEL_UP_MOVE(62, MOVE_DOUBLEEDGE),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sScolipedeLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 0, MOVE_BATONPASS),
-	LEVEL_UP_MOVE( 1, MOVE_BATONPASS),
-	LEVEL_UP_MOVE( 1, MOVE_IRONDEFENSE),
-	LEVEL_UP_MOVE( 1, MOVE_MEGAHORN),
+	LEVEL_UP_MOVE( 1, MOVE_BUGBITE),
+	LEVEL_UP_MOVE( 1, MOVE_POISONSTING),
+	LEVEL_UP_MOVE( 1, MOVE_PURSUIT),
 	LEVEL_UP_MOVE( 1, MOVE_DEFENSECURL),
 	LEVEL_UP_MOVE( 1, MOVE_ROLLOUT),
-	LEVEL_UP_MOVE( 1, MOVE_POISONSTING),
-	LEVEL_UP_MOVE( 1, MOVE_SCREECH),
-	LEVEL_UP_MOVE( 5, MOVE_POISONSTING),
-	LEVEL_UP_MOVE( 8, MOVE_SCREECH),
-	LEVEL_UP_MOVE(12, MOVE_PURSUIT),
-	LEVEL_UP_MOVE(15, MOVE_PROTECT),
-	LEVEL_UP_MOVE(19, MOVE_POISONTAIL),
-	LEVEL_UP_MOVE(23, MOVE_BUGBITE),
-	LEVEL_UP_MOVE(28, MOVE_VENOSHOCK),
-	LEVEL_UP_MOVE(33, MOVE_AGILITY),
-	LEVEL_UP_MOVE(39, MOVE_STEAMROLLER),
-	LEVEL_UP_MOVE(44, MOVE_TOXIC),
-	LEVEL_UP_MOVE(47, MOVE_VENOMDRENCH),
-	LEVEL_UP_MOVE(50, MOVE_ROCKCLIMB),
-	LEVEL_UP_MOVE(55, MOVE_DOUBLEEDGE),
-	LEVEL_UP_MOVE(65, MOVE_MEGAHORN),
+	LEVEL_UP_MOVE( 1, MOVE_PROTECT),
+	LEVEL_UP_MOVE(12, MOVE_POISONTAIL),
+	LEVEL_UP_MOVE(16, MOVE_SCREECH),
+	LEVEL_UP_MOVE(20, MOVE_STEAMROLLER),
+	LEVEL_UP_MOVE(21, MOVE_IRONDEFENSE),
+	LEVEL_UP_MOVE(25, MOVE_VENOSHOCK),
+	LEVEL_UP_MOVE(29, MOVE_BATONPASS),
+	LEVEL_UP_MOVE(30, MOVE_TAKEDOWN),
+	LEVEL_UP_MOVE(38, MOVE_XSCISSOR),
+	LEVEL_UP_MOVE(44, MOVE_AGILITY),
+	LEVEL_UP_MOVE(49, MOVE_POISONJAB),
+	LEVEL_UP_MOVE(54, MOVE_TOXIC),
+	LEVEL_UP_MOVE(59, MOVE_VENOMDRENCH),
+	LEVEL_UP_MOVE(64, MOVE_ROCKCLIMB),
+	LEVEL_UP_MOVE(70, MOVE_DOUBLEEDGE),
+	LEVEL_UP_MOVE(76, MOVE_MEGAHORN),
 	LEVEL_UP_END
 };
 
@@ -10934,14 +11149,29 @@ static const struct LevelUpMove sCottoneeLevelUpLearnset[] = {
 };
 
 static const struct LevelUpMove sWhimsicottLevelUpLearnset[] = {
+	LEVEL_UP_MOVE( 1, MOVE_HURRICANE),
+	LEVEL_UP_MOVE( 1, MOVE_MEMENTO),
+	LEVEL_UP_MOVE( 1, MOVE_MEGADRAIN),
+	LEVEL_UP_MOVE( 1, MOVE_RAZORLEAF),
 	LEVEL_UP_MOVE( 1, MOVE_GROWTH),
+	LEVEL_UP_MOVE( 1, MOVE_POISONPOWDER),
+	LEVEL_UP_MOVE( 1, MOVE_CHARM),
 	LEVEL_UP_MOVE( 1, MOVE_LEECHSEED),
 	LEVEL_UP_MOVE( 1, MOVE_MEGADRAIN),
 	LEVEL_UP_MOVE( 1, MOVE_COTTONSPORE),
-	LEVEL_UP_MOVE(10, MOVE_GUST),
-	LEVEL_UP_MOVE(28, MOVE_TAILWIND),
-	LEVEL_UP_MOVE(46, MOVE_HURRICANE),
-	LEVEL_UP_MOVE(50, MOVE_MOONBLAST),
+	LEVEL_UP_MOVE( 1, MOVE_ENERGYBALL),
+	LEVEL_UP_MOVE( 1, MOVE_SUNNYDAY),
+	LEVEL_UP_MOVE( 1, MOVE_ENDEAVOR),
+	LEVEL_UP_MOVE( 1, MOVE_COTTONGUARD),
+	LEVEL_UP_MOVE( 1, MOVE_SOLARBEAM),
+	LEVEL_UP_MOVE( 1, MOVE_ABSORB),
+	LEVEL_UP_MOVE( 1, MOVE_HELPINGHAND),
+	LEVEL_UP_MOVE( 1, MOVE_FAIRYWIND),
+	LEVEL_UP_MOVE( 1, MOVE_STUNSPORE),
+	LEVEL_UP_MOVE( 1, MOVE_GUST),
+	LEVEL_UP_MOVE( 1, MOVE_TAILWIND),
+	LEVEL_UP_MOVE( 1, MOVE_MOONBLAST),
+	LEVEL_UP_MOVE( 1, MOVE_GIGADRAIN),
 	LEVEL_UP_END
 };
 
@@ -11000,115 +11230,111 @@ static const struct LevelUpMove sBasculinLevelUpLearnset[] = {
 };
 
 static const struct LevelUpMove sSandileLevelUpLearnset[] = {
-	LEVEL_UP_MOVE( 1, MOVE_LEER),
+	LEVEL_UP_MOVE( 1, MOVE_EMBARGO),
 	LEVEL_UP_MOVE( 1, MOVE_RAGE),
-	LEVEL_UP_MOVE( 4, MOVE_BITE),
-	LEVEL_UP_MOVE( 7, MOVE_SANDATTACK),
-	LEVEL_UP_MOVE(10, MOVE_TORMENT),
-	LEVEL_UP_MOVE(13, MOVE_SANDTOMB),
-	LEVEL_UP_MOVE(16, MOVE_ASSURANCE),
-	LEVEL_UP_MOVE(19, MOVE_MUDSLAP),
-	LEVEL_UP_MOVE(22, MOVE_EMBARGO),
-	LEVEL_UP_MOVE(25, MOVE_SWAGGER),
-	LEVEL_UP_MOVE(28, MOVE_CRUNCH),
-	LEVEL_UP_MOVE(31, MOVE_DIG),
-	LEVEL_UP_MOVE(34, MOVE_SCARYFACE),
-	LEVEL_UP_MOVE(37, MOVE_FOULPLAY),
-	LEVEL_UP_MOVE(40, MOVE_SANDSTORM),
-	LEVEL_UP_MOVE(43, MOVE_EARTHQUAKE),
-	LEVEL_UP_MOVE(46, MOVE_THRASH),
+	LEVEL_UP_MOVE( 1, MOVE_POWERTRIP),
+	LEVEL_UP_MOVE( 1, MOVE_LEER),
+	LEVEL_UP_MOVE( 3, MOVE_SANDATTACK),
+	LEVEL_UP_MOVE( 6, MOVE_HONECLAWS),
+	LEVEL_UP_MOVE( 9, MOVE_SANDTOMB),
+	LEVEL_UP_MOVE(12, MOVE_SCARYFACE),
+	LEVEL_UP_MOVE(15, MOVE_BITE),
+	LEVEL_UP_MOVE(18, MOVE_TORMENT),
+	LEVEL_UP_MOVE(20, MOVE_DIG),
+	LEVEL_UP_MOVE(23, MOVE_SWAGGER),
+	LEVEL_UP_MOVE(25, MOVE_FOULPLAY),
+	LEVEL_UP_MOVE(29, MOVE_BULLDOZE),
+	LEVEL_UP_MOVE(32, MOVE_CRUNCH),
+	LEVEL_UP_MOVE(35, MOVE_SANDSTORM),
+	LEVEL_UP_MOVE(37, MOVE_EARTHQUAKE),
+	LEVEL_UP_MOVE(40, MOVE_THRASH),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sKrokorokLevelUpLearnset[] = {
-	LEVEL_UP_MOVE( 1, MOVE_LEER),
+	LEVEL_UP_MOVE( 1, MOVE_BULLDOZE),
+	LEVEL_UP_MOVE( 1, MOVE_EMBARGO),
 	LEVEL_UP_MOVE( 1, MOVE_RAGE),
-	LEVEL_UP_MOVE( 1, MOVE_BITE),
+	LEVEL_UP_MOVE( 1, MOVE_POWERTRIP),
+	LEVEL_UP_MOVE( 1, MOVE_LEER),
 	LEVEL_UP_MOVE( 1, MOVE_SANDATTACK),
-	LEVEL_UP_MOVE( 4, MOVE_BITE),
-	LEVEL_UP_MOVE( 7, MOVE_SANDATTACK),
-	LEVEL_UP_MOVE(10, MOVE_TORMENT),
-	LEVEL_UP_MOVE(13, MOVE_SANDTOMB),
-	LEVEL_UP_MOVE(16, MOVE_ASSURANCE),
-	LEVEL_UP_MOVE(19, MOVE_MUDSLAP),
-	LEVEL_UP_MOVE(22, MOVE_EMBARGO),
-	LEVEL_UP_MOVE(25, MOVE_SWAGGER),
-	LEVEL_UP_MOVE(28, MOVE_CRUNCH),
-	LEVEL_UP_MOVE(32, MOVE_DIG),
-	LEVEL_UP_MOVE(36, MOVE_SCARYFACE),
-	LEVEL_UP_MOVE(40, MOVE_FOULPLAY),
-	LEVEL_UP_MOVE(44, MOVE_SANDSTORM),
-	LEVEL_UP_MOVE(48, MOVE_EARTHQUAKE),
-	LEVEL_UP_MOVE(52, MOVE_THRASH),
+	LEVEL_UP_MOVE( 1, MOVE_HONECLAWS),
+	LEVEL_UP_MOVE( 9, MOVE_SANDTOMB),
+	LEVEL_UP_MOVE(12, MOVE_SCARYFACE),
+	LEVEL_UP_MOVE(15, MOVE_BITE),
+	LEVEL_UP_MOVE(18, MOVE_TORMENT),
+	LEVEL_UP_MOVE(20, MOVE_DIG),
+	LEVEL_UP_MOVE(23, MOVE_SWAGGER),
+	LEVEL_UP_MOVE(25, MOVE_FOULPLAY),
+	LEVEL_UP_MOVE(29, MOVE_STOMPINGTANTRUM),
+	LEVEL_UP_MOVE(34, MOVE_CRUNCH),
+	LEVEL_UP_MOVE(39, MOVE_SANDSTORM),
+	LEVEL_UP_MOVE(43, MOVE_EARTHQUAKE),
+	LEVEL_UP_MOVE(48, MOVE_THRASH),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sKrookodileLevelUpLearnset[] = {
+	LEVEL_UP_MOVE( 1, MOVE_BULLDOZE),
+	LEVEL_UP_MOVE( 1, MOVE_EMBARGO),
+	LEVEL_UP_MOVE( 1, MOVE_RAGE),
 	LEVEL_UP_MOVE( 1, MOVE_POWERTRIP),
 	LEVEL_UP_MOVE( 1, MOVE_LEER),
-	LEVEL_UP_MOVE( 1, MOVE_RAGE),
-	LEVEL_UP_MOVE( 1, MOVE_BITE),
 	LEVEL_UP_MOVE( 1, MOVE_SANDATTACK),
-	LEVEL_UP_MOVE( 4, MOVE_BITE),
-	LEVEL_UP_MOVE( 7, MOVE_SANDATTACK),
-	LEVEL_UP_MOVE(10, MOVE_TORMENT),
-	LEVEL_UP_MOVE(13, MOVE_SANDTOMB),
-	LEVEL_UP_MOVE(16, MOVE_ASSURANCE),
-	LEVEL_UP_MOVE(19, MOVE_MUDSLAP),
-	LEVEL_UP_MOVE(22, MOVE_EMBARGO),
-	LEVEL_UP_MOVE(25, MOVE_SWAGGER),
-	LEVEL_UP_MOVE(28, MOVE_CRUNCH),
-	LEVEL_UP_MOVE(32, MOVE_DIG),
-	LEVEL_UP_MOVE(36, MOVE_SCARYFACE),
-	LEVEL_UP_MOVE(42, MOVE_FOULPLAY),
-	LEVEL_UP_MOVE(48, MOVE_SANDSTORM),
-	LEVEL_UP_MOVE(54, MOVE_EARTHQUAKE),
-	LEVEL_UP_MOVE(60, MOVE_OUTRAGE),
+	LEVEL_UP_MOVE( 1, MOVE_HONECLAWS),
+	LEVEL_UP_MOVE( 9, MOVE_SANDTOMB),
+	LEVEL_UP_MOVE(12, MOVE_SCARYFACE),
+	LEVEL_UP_MOVE(15, MOVE_BITE),
+	LEVEL_UP_MOVE(18, MOVE_TORMENT),
+	LEVEL_UP_MOVE(20, MOVE_DIG),
+	LEVEL_UP_MOVE(23, MOVE_SWAGGER),
+	LEVEL_UP_MOVE(25, MOVE_FOULPLAY),
+	LEVEL_UP_MOVE(29, MOVE_STOMPINGTANTRUM),
+	LEVEL_UP_MOVE(34, MOVE_CRUNCH),
+	LEVEL_UP_MOVE(39, MOVE_SANDSTORM),
+	LEVEL_UP_MOVE(46, MOVE_EARTHQUAKE),
+	LEVEL_UP_MOVE(52, MOVE_THRASH),
+	LEVEL_UP_MOVE(58, MOVE_OUTRAGE),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sDarumakaLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_TACKLE),
 	LEVEL_UP_MOVE( 3, MOVE_ROLLOUT),
-	LEVEL_UP_MOVE( 6, MOVE_INCINERATE),
-	LEVEL_UP_MOVE( 9, MOVE_RAGE),
-	LEVEL_UP_MOVE(11, MOVE_FIREFANG),
-	LEVEL_UP_MOVE(14, MOVE_HEADBUTT),
-	LEVEL_UP_MOVE(17, MOVE_UPROAR),
-	LEVEL_UP_MOVE(19, MOVE_FACADE),
-	LEVEL_UP_MOVE(22, MOVE_FIREPUNCH),
-	LEVEL_UP_MOVE(25, MOVE_WORKUP),
-	LEVEL_UP_MOVE(27, MOVE_THRASH),
-	LEVEL_UP_MOVE(30, MOVE_BELLYDRUM),
-	LEVEL_UP_MOVE(33, MOVE_FLAREBLITZ),
-	LEVEL_UP_MOVE(35, MOVE_TAUNT),
-	LEVEL_UP_MOVE(39, MOVE_SUPERPOWER),
-	LEVEL_UP_MOVE(42, MOVE_OVERHEAT),
+	LEVEL_UP_MOVE( 6, MOVE_TAUNT),
+	LEVEL_UP_MOVE( 8, MOVE_BITE),
+	LEVEL_UP_MOVE(12, MOVE_INCINERATE),
+	LEVEL_UP_MOVE(16, MOVE_WORKUP),
+	LEVEL_UP_MOVE(20, MOVE_FIREFANG),
+	LEVEL_UP_MOVE(24, MOVE_HEADBUTT),
+	LEVEL_UP_MOVE(28, MOVE_FACADE),
+	LEVEL_UP_MOVE(32, MOVE_FIREPUNCH),
+	LEVEL_UP_MOVE(36, MOVE_UPROAR),
+	LEVEL_UP_MOVE(40, MOVE_BELLYDRUM),
+	LEVEL_UP_MOVE(44, MOVE_FLAREBLITZ),
+	LEVEL_UP_MOVE(48, MOVE_THRASH),
+	LEVEL_UP_MOVE(52, MOVE_SUPERPOWER),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sDarmanitanLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 0, MOVE_HAMMERARM),
-	LEVEL_UP_MOVE( 1, MOVE_HAMMERARM),
+	LEVEL_UP_MOVE( 1, MOVE_EMBER),
 	LEVEL_UP_MOVE( 1, MOVE_TACKLE),
-	LEVEL_UP_MOVE( 1, MOVE_ROLLOUT),
-	LEVEL_UP_MOVE( 1, MOVE_INCINERATE),
-	LEVEL_UP_MOVE( 1, MOVE_RAGE),
-	LEVEL_UP_MOVE( 3, MOVE_ROLLOUT),
-	LEVEL_UP_MOVE( 6, MOVE_INCINERATE),
-	LEVEL_UP_MOVE( 9, MOVE_RAGE),
-	LEVEL_UP_MOVE(11, MOVE_FIREFANG),
-	LEVEL_UP_MOVE(14, MOVE_HEADBUTT),
-	LEVEL_UP_MOVE(17, MOVE_SWAGGER),
-	LEVEL_UP_MOVE(19, MOVE_FACADE),
-	LEVEL_UP_MOVE(22, MOVE_FIREPUNCH),
-	LEVEL_UP_MOVE(25, MOVE_WORKUP),
-	LEVEL_UP_MOVE(27, MOVE_THRASH),
-	LEVEL_UP_MOVE(30, MOVE_BELLYDRUM),
-	LEVEL_UP_MOVE(33, MOVE_FLAREBLITZ),
-	LEVEL_UP_MOVE(39, MOVE_TAUNT),
-	LEVEL_UP_MOVE(47, MOVE_SUPERPOWER),
-	LEVEL_UP_MOVE(54, MOVE_OVERHEAT),
+	LEVEL_UP_MOVE( 1, MOVE_TAUNT),
+	LEVEL_UP_MOVE( 1, MOVE_BITE),
+	LEVEL_UP_MOVE(12, MOVE_INCINERATE),
+	LEVEL_UP_MOVE(16, MOVE_WORKUP),
+	LEVEL_UP_MOVE(20, MOVE_FIREFANG),
+	LEVEL_UP_MOVE(24, MOVE_HEADBUTT),
+	LEVEL_UP_MOVE(28, MOVE_FACADE),
+	LEVEL_UP_MOVE(32, MOVE_FIREPUNCH),
+	LEVEL_UP_MOVE(34, MOVE_HAMMERARM),
+	LEVEL_UP_MOVE(38, MOVE_UPROAR),
+	LEVEL_UP_MOVE(44, MOVE_BELLYDRUM),
+	LEVEL_UP_MOVE(50, MOVE_FLAREBLITZ),
+	LEVEL_UP_MOVE(56, MOVE_THRASH),
+	LEVEL_UP_MOVE(62, MOVE_SUPERPOWER),
 	LEVEL_UP_END
 };
 
@@ -11118,23 +11344,25 @@ static const struct LevelUpMove sMaractusLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_AFTERYOU),
 	LEVEL_UP_MOVE( 1, MOVE_PECK),
 	LEVEL_UP_MOVE( 1, MOVE_ABSORB),
-	LEVEL_UP_MOVE( 3, MOVE_SWEETSCENT),
-	LEVEL_UP_MOVE( 6, MOVE_GROWTH),
-	LEVEL_UP_MOVE(10, MOVE_PINMISSILE),
-	LEVEL_UP_MOVE(13, MOVE_MEGADRAIN),
-	LEVEL_UP_MOVE(15, MOVE_SYNTHESIS),
-	LEVEL_UP_MOVE(18, MOVE_COTTONSPORE),
-	LEVEL_UP_MOVE(22, MOVE_NEEDLEARM),
-	LEVEL_UP_MOVE(26, MOVE_GIGADRAIN),
-	LEVEL_UP_MOVE(29, MOVE_ACUPRESSURE),
-	LEVEL_UP_MOVE(33, MOVE_INGRAIN),
-	LEVEL_UP_MOVE(38, MOVE_PETALDANCE),
-	LEVEL_UP_MOVE(42, MOVE_SUCKERPUNCH),
-	LEVEL_UP_MOVE(45, MOVE_SUNNYDAY),
-	LEVEL_UP_MOVE(48, MOVE_PETALBLIZZARD),
-	LEVEL_UP_MOVE(50, MOVE_SOLARBEAM),
-	LEVEL_UP_MOVE(55, MOVE_COTTONGUARD),
-	LEVEL_UP_MOVE(57, MOVE_AFTERYOU),
+	LEVEL_UP_MOVE( 1, MOVE_AFTERYOU),
+	LEVEL_UP_MOVE( 1, MOVE_INGRAIN),
+	LEVEL_UP_MOVE( 4, MOVE_GROWTH),
+	LEVEL_UP_MOVE( 8, MOVE_MEGADRAIN),
+	LEVEL_UP_MOVE(12, MOVE_LEECHSEED),
+	LEVEL_UP_MOVE(15, MOVE_SUCKERPUNCH),
+	LEVEL_UP_MOVE(19, MOVE_NEEDLEARM),
+	LEVEL_UP_MOVE(23, MOVE_PINMISSILE),
+	LEVEL_UP_MOVE(27, MOVE_SWEETSCENT),
+	LEVEL_UP_MOVE(30, MOVE_GIGADRAIN),
+	LEVEL_UP_MOVE(34, MOVE_SYNTHESIS),
+	LEVEL_UP_MOVE(37, MOVE_COTTONSPORE),
+	LEVEL_UP_MOVE(40, MOVE_PETALBLIZZARD),
+	LEVEL_UP_MOVE(44, MOVE_COTTONGUARD),
+	LEVEL_UP_MOVE(47, MOVE_ACUPRESSURE),
+	LEVEL_UP_MOVE(50, MOVE_PETALDANCE),
+	LEVEL_UP_MOVE(54, MOVE_SUNNYDAY),
+	LEVEL_UP_MOVE(57, MOVE_SOLARBEAM),
+	LEVEL_UP_MOVE(61, MOVE_SEEDFLARE),
 	LEVEL_UP_END
 };
 
@@ -11161,64 +11389,60 @@ static const struct LevelUpMove sCrustleLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_SHELLSMASH),
 	LEVEL_UP_MOVE( 1, MOVE_ROCKBLAST),
 	LEVEL_UP_MOVE( 1, MOVE_WITHDRAW),
-	LEVEL_UP_MOVE( 1, MOVE_SANDATTACK),
-	LEVEL_UP_MOVE( 5, MOVE_ROCKBLAST),
-	LEVEL_UP_MOVE( 7, MOVE_WITHDRAW),
-	LEVEL_UP_MOVE(11, MOVE_SANDATTACK),
-	LEVEL_UP_MOVE(13, MOVE_FEINTATTACK),
-	LEVEL_UP_MOVE(17, MOVE_SMACKDOWN),
-	LEVEL_UP_MOVE(19, MOVE_ROCKPOLISH),
-	LEVEL_UP_MOVE(23, MOVE_BUGBITE),
-	LEVEL_UP_MOVE(24, MOVE_STEALTHROCK),
-	LEVEL_UP_MOVE(29, MOVE_ROCKSLIDE),
-	LEVEL_UP_MOVE(31, MOVE_SLASH),
-	LEVEL_UP_MOVE(38, MOVE_XSCISSOR),
-	LEVEL_UP_MOVE(43, MOVE_SHELLSMASH),
-	LEVEL_UP_MOVE(50, MOVE_FLAIL),
-	LEVEL_UP_MOVE(55, MOVE_ROCKWRECKER),
+	LEVEL_UP_MOVE( 1, MOVE_SMACKDOWN),
+	LEVEL_UP_MOVE(12, MOVE_BUGBITE),
+	LEVEL_UP_MOVE(16, MOVE_FEINTATTACK),
+	LEVEL_UP_MOVE(20, MOVE_FLAIL),
+	LEVEL_UP_MOVE(24, MOVE_ROCKSLIDE),
+	LEVEL_UP_MOVE(28, MOVE_SLASH),
+	LEVEL_UP_MOVE(32, MOVE_STEALTHROCK),
+	LEVEL_UP_MOVE(37, MOVE_ROCKBLAST),
+	LEVEL_UP_MOVE(42, MOVE_XSCISSOR),
+	LEVEL_UP_MOVE(47, MOVE_ROCKPOLISH),
+	LEVEL_UP_MOVE(52, MOVE_SHELLSMASH),
+	LEVEL_UP_MOVE(57, MOVE_ROCKWRECKER),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sScraggyLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_LEER),
-	LEVEL_UP_MOVE( 1, MOVE_HEADBUTT),
-	LEVEL_UP_MOVE( 5, MOVE_SANDATTACK),
-	LEVEL_UP_MOVE( 9, MOVE_FEINTATTACK),
-	LEVEL_UP_MOVE(12, MOVE_SWAGGER),
-	LEVEL_UP_MOVE(16, MOVE_LOWKICK),
-	LEVEL_UP_MOVE(20, MOVE_PAYBACK),
-	LEVEL_UP_MOVE(23, MOVE_BRICKBREAK),
-	LEVEL_UP_MOVE(27, MOVE_CHIPAWAY),
-	LEVEL_UP_MOVE(31, MOVE_HIGHJUMPKICK),
-	LEVEL_UP_MOVE(34, MOVE_SCARYFACE),
-	LEVEL_UP_MOVE(38, MOVE_CRUNCH),
-	LEVEL_UP_MOVE(42, MOVE_FACADE),
-	LEVEL_UP_MOVE(45, MOVE_ROCKCLIMB),
-	LEVEL_UP_MOVE(48, MOVE_FOCUSPUNCH),
-	LEVEL_UP_MOVE(50, MOVE_HEADSMASH),
+	LEVEL_UP_MOVE( 1, MOVE_FAKEOUT),
+	LEVEL_UP_MOVE( 1, MOVE_LOWKICK),
+	LEVEL_UP_MOVE( 4, MOVE_PAYBACK),
+	LEVEL_UP_MOVE( 8, MOVE_HEADBUTT),
+	LEVEL_UP_MOVE(12, MOVE_SANDATTACK),
+	LEVEL_UP_MOVE(15, MOVE_FACADE),
+	LEVEL_UP_MOVE(19, MOVE_POWERUPPUNCH),
+	LEVEL_UP_MOVE(23, MOVE_PROTECT),
+	LEVEL_UP_MOVE(26, MOVE_SCARYFACE),
+	LEVEL_UP_MOVE(29, MOVE_BRICKBREAK),
+	LEVEL_UP_MOVE(33, MOVE_CRUNCH),
+	LEVEL_UP_MOVE(37, MOVE_SWAGGER),
+	LEVEL_UP_MOVE(40, MOVE_ROCKCLIMB),
+	LEVEL_UP_MOVE(44, MOVE_DUALCHOP),
+	LEVEL_UP_MOVE(48, MOVE_HIGHJUMPKICK),
+	LEVEL_UP_MOVE(52, MOVE_HEADSMASH),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sScraftyLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_LEER),
-	LEVEL_UP_MOVE( 1, MOVE_HEADBUTT),
-	LEVEL_UP_MOVE( 1, MOVE_SANDATTACK),
-	LEVEL_UP_MOVE( 1, MOVE_FEINTATTACK),
-	LEVEL_UP_MOVE( 5, MOVE_SANDATTACK),
-	LEVEL_UP_MOVE( 9, MOVE_FEINTATTACK),
-	LEVEL_UP_MOVE(12, MOVE_SWAGGER),
-	LEVEL_UP_MOVE(16, MOVE_LOWKICK),
-	LEVEL_UP_MOVE(20, MOVE_PAYBACK),
-	LEVEL_UP_MOVE(23, MOVE_BRICKBREAK),
-	LEVEL_UP_MOVE(27, MOVE_CHIPAWAY),
-	LEVEL_UP_MOVE(31, MOVE_HIGHJUMPKICK),
-	LEVEL_UP_MOVE(34, MOVE_SCARYFACE),
-	LEVEL_UP_MOVE(38, MOVE_CRUNCH),
-	LEVEL_UP_MOVE(45, MOVE_FACADE),
-	LEVEL_UP_MOVE(51, MOVE_ROCKCLIMB),
-	LEVEL_UP_MOVE(58, MOVE_FOCUSPUNCH),
-	LEVEL_UP_MOVE(65, MOVE_HEADSMASH),
-	LEVEL_UP_END
+	LEVEL_UP_MOVE( 1, MOVE_FAKEOUT),
+	LEVEL_UP_MOVE( 1, MOVE_LOWKICK),
+	LEVEL_UP_MOVE( 4, MOVE_PAYBACK),
+	LEVEL_UP_MOVE( 8, MOVE_HEADBUTT),
+	LEVEL_UP_MOVE(12, MOVE_SANDATTACK),
+	LEVEL_UP_MOVE(15, MOVE_FACADE),
+	LEVEL_UP_MOVE(19, MOVE_POWERUPPUNCH),
+	LEVEL_UP_MOVE(23, MOVE_PROTECT),
+	LEVEL_UP_MOVE(26, MOVE_SCARYFACE),
+	LEVEL_UP_MOVE(29, MOVE_BRICKBREAK),
+	LEVEL_UP_MOVE(33, MOVE_CRUNCH),
+	LEVEL_UP_MOVE(37, MOVE_SWAGGER),
+	LEVEL_UP_MOVE(42, MOVE_ROCKCLIMB),
+	LEVEL_UP_MOVE(48, MOVE_DUALCHOP),
+	LEVEL_UP_MOVE(54, MOVE_HIGHJUMPKICK),
+	LEVEL_UP_MOVE(58, MOVE_HEADSMASH),
 };
 
 static const struct LevelUpMove sSigilyphLevelUpLearnset[] = {
@@ -11226,38 +11450,39 @@ static const struct LevelUpMove sSigilyphLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_MIRACLEEYE),
 	LEVEL_UP_MOVE( 4, MOVE_HYPNOSIS),
 	LEVEL_UP_MOVE( 8, MOVE_PSYWAVE),
-	LEVEL_UP_MOVE(11, MOVE_TAILWIND),
-	LEVEL_UP_MOVE(14, MOVE_WHIRLWIND),
+	LEVEL_UP_MOVE(11, MOVE_HYPNOSIS),
+	LEVEL_UP_MOVE(14, MOVE_AIRCUTTER),
 	LEVEL_UP_MOVE(18, MOVE_PSYBEAM),
-	LEVEL_UP_MOVE(21, MOVE_AIRCUTTER),
-	LEVEL_UP_MOVE(24, MOVE_LIGHTSCREEN),
-	LEVEL_UP_MOVE(28, MOVE_REFLECT),
-	LEVEL_UP_MOVE(31, MOVE_SYNCHRONOISE),
-	LEVEL_UP_MOVE(34, MOVE_MIRRORMOVE),
-	LEVEL_UP_MOVE(38, MOVE_GRAVITY),
-	LEVEL_UP_MOVE(41, MOVE_AIRSLASH),
-	LEVEL_UP_MOVE(44, MOVE_PSYCHIC),
-	LEVEL_UP_MOVE(48, MOVE_COSMICPOWER),
-	LEVEL_UP_MOVE(50, MOVE_SKYATTACK),
+	LEVEL_UP_MOVE(22, MOVE_WHIRLWIND),
+	LEVEL_UP_MOVE(26, MOVE_COSMICPOWER),
+	LEVEL_UP_MOVE(30, MOVE_AIRSLASH),
+	LEVEL_UP_MOVE(35, MOVE_PSYCHIC),
+	LEVEL_UP_MOVE(39, MOVE_TAILWIND),
+	LEVEL_UP_MOVE(43, MOVE_LIGHTSCREEN),
+	LEVEL_UP_MOVE(43, MOVE_REFLECT),
+	LEVEL_UP_MOVE(47, MOVE_SYNCHRONOISE),
+	LEVEL_UP_MOVE(52, MOVE_SKILLSWAP),
+	LEVEL_UP_MOVE(56, MOVE_SKYATTACK),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sYamaskLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_ASTONISH),
 	LEVEL_UP_MOVE( 1, MOVE_PROTECT),
-	LEVEL_UP_MOVE( 5, MOVE_DISABLE),
-	LEVEL_UP_MOVE( 9, MOVE_HAZE),
-	LEVEL_UP_MOVE(13, MOVE_NIGHTSHADE),
-	LEVEL_UP_MOVE(17, MOVE_HEX),
-	LEVEL_UP_MOVE(21, MOVE_WILLOWISP),
-	LEVEL_UP_MOVE(25, MOVE_OMINOUSWIND),
-	LEVEL_UP_MOVE(29, MOVE_CURSE),
-	LEVEL_UP_MOVE(33, MOVE_POWERSPLIT),
-	LEVEL_UP_MOVE(33, MOVE_GUARDSPLIT),
-	LEVEL_UP_MOVE(37, MOVE_SHADOWBALL),
-	LEVEL_UP_MOVE(41, MOVE_GRUDGE),
-	LEVEL_UP_MOVE(45, MOVE_MEANLOOK),
-	LEVEL_UP_MOVE(49, MOVE_DESTINYBOND),
+	LEVEL_UP_MOVE( 4, MOVE_HAZE),
+	LEVEL_UP_MOVE( 8, MOVE_NIGHTSHADE),
+	LEVEL_UP_MOVE(12, MOVE_DISABLE),
+	LEVEL_UP_MOVE(16, MOVE_WILLOWISP),
+	LEVEL_UP_MOVE(20, MOVE_CRAFTYSHIELD),
+	LEVEL_UP_MOVE(24, MOVE_HEX),
+	LEVEL_UP_MOVE(28, MOVE_MEANLOOK),
+	LEVEL_UP_MOVE(32, MOVE_GRUDGE),
+	LEVEL_UP_MOVE(36, MOVE_CURSE),
+	LEVEL_UP_MOVE(40, MOVE_SHADOWBALL),
+	LEVEL_UP_MOVE(44, MOVE_DARKPULSE),
+	LEVEL_UP_MOVE(48, MOVE_POWERSPLIT),
+	LEVEL_UP_MOVE(48, MOVE_GUARDSPLIT),
+	LEVEL_UP_MOVE(52, MOVE_DESTINYBOND),
 	LEVEL_UP_END
 };
 
@@ -11268,19 +11493,20 @@ static const struct LevelUpMove sCofagrigusLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_PROTECT),
 	LEVEL_UP_MOVE( 1, MOVE_DISABLE),
 	LEVEL_UP_MOVE( 1, MOVE_HAZE),
-	LEVEL_UP_MOVE( 5, MOVE_DISABLE),
-	LEVEL_UP_MOVE( 9, MOVE_HAZE),
-	LEVEL_UP_MOVE(13, MOVE_NIGHTSHADE),
-	LEVEL_UP_MOVE(17, MOVE_HEX),
-	LEVEL_UP_MOVE(21, MOVE_WILLOWISP),
-	LEVEL_UP_MOVE(25, MOVE_OMINOUSWIND),
-	LEVEL_UP_MOVE(29, MOVE_CURSE),
-	LEVEL_UP_MOVE(33, MOVE_POWERSPLIT),
-	LEVEL_UP_MOVE(33, MOVE_GUARDSPLIT),
-	LEVEL_UP_MOVE(39, MOVE_SHADOWBALL),
-	LEVEL_UP_MOVE(45, MOVE_GRUDGE),
-	LEVEL_UP_MOVE(51, MOVE_MEANLOOK),
-	LEVEL_UP_MOVE(57, MOVE_DESTINYBOND),
+	LEVEL_UP_MOVE( 1, MOVE_NIGHTSHADE),
+	LEVEL_UP_MOVE(12, MOVE_DISABLE),
+	LEVEL_UP_MOVE(16, MOVE_WILLOWISP),
+	LEVEL_UP_MOVE(20, MOVE_CRAFTYSHIELD),
+	LEVEL_UP_MOVE(24, MOVE_HEX),
+	LEVEL_UP_MOVE(28, MOVE_MEANLOOK),
+	LEVEL_UP_MOVE(32, MOVE_GRUDGE),
+	LEVEL_UP_MOVE(33, MOVE_SHADOWCLAW),
+	LEVEL_UP_MOVE(38, MOVE_CURSE),
+	LEVEL_UP_MOVE(44, MOVE_SHADOWBALL),
+	LEVEL_UP_MOVE(50, MOVE_DARKPULSE),
+	LEVEL_UP_MOVE(56, MOVE_POWERSPLIT),
+	LEVEL_UP_MOVE(56, MOVE_GUARDSPLIT),
+	LEVEL_UP_MOVE(62, MOVE_DESTINYBOND),
 	LEVEL_UP_END
 };
 
@@ -11337,21 +11563,22 @@ static const struct LevelUpMove sArchenLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 8, MOVE_DOUBLETEAM),
 	LEVEL_UP_MOVE(11, MOVE_SCARYFACE),
 	LEVEL_UP_MOVE(15, MOVE_PLUCK),
-	LEVEL_UP_MOVE(18, MOVE_ANCIENTPOWER),
-	LEVEL_UP_MOVE(21, MOVE_AGILITY),
-	LEVEL_UP_MOVE(25, MOVE_QUICKGUARD),
-	LEVEL_UP_MOVE(28, MOVE_ACROBATICS),
-	LEVEL_UP_MOVE(31, MOVE_DRAGONBREATH),
-	LEVEL_UP_MOVE(35, MOVE_CRUNCH),
-	LEVEL_UP_MOVE(38, MOVE_ENDEAVOR),
-	LEVEL_UP_MOVE(41, MOVE_UTURN),
-	LEVEL_UP_MOVE(45, MOVE_ROCKSLIDE),
-	LEVEL_UP_MOVE(48, MOVE_DRAGONCLAW),
-	LEVEL_UP_MOVE(50, MOVE_THRASH),
+	LEVEL_UP_MOVE(18, MOVE_QUICKGUARD),
+	LEVEL_UP_MOVE(21, MOVE_UTURN),
+	LEVEL_UP_MOVE(24, MOVE_ROCKSLIDE),
+	LEVEL_UP_MOVE(27, MOVE_SCARYFACE),
+	LEVEL_UP_MOVE(30, MOVE_CRUNCH),
+	LEVEL_UP_MOVE(33, MOVE_AGILITY),
+	LEVEL_UP_MOVE(36, MOVE_TAILWIND),
+	LEVEL_UP_MOVE(39, MOVE_ACROBATICS),
+	LEVEL_UP_MOVE(42, MOVE_DRAGONCLAW),
+	LEVEL_UP_MOVE(45, MOVE_THRASH),
+	LEVEL_UP_MOVE(48, MOVE_ENDEAVOR),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sArcheopsLevelUpLearnset[] = {
+	LEVEL_UP_MOVE( 1, MOVE_THRASH),
 	LEVEL_UP_MOVE( 1, MOVE_QUICKATTACK),
 	LEVEL_UP_MOVE( 1, MOVE_LEER),
 	LEVEL_UP_MOVE( 1, MOVE_WINGATTACK),
@@ -11360,17 +11587,17 @@ static const struct LevelUpMove sArcheopsLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 8, MOVE_DOUBLETEAM),
 	LEVEL_UP_MOVE(11, MOVE_SCARYFACE),
 	LEVEL_UP_MOVE(15, MOVE_PLUCK),
-	LEVEL_UP_MOVE(18, MOVE_ANCIENTPOWER),
-	LEVEL_UP_MOVE(21, MOVE_AGILITY),
-	LEVEL_UP_MOVE(25, MOVE_QUICKGUARD),
-	LEVEL_UP_MOVE(28, MOVE_ACROBATICS),
-	LEVEL_UP_MOVE(31, MOVE_DRAGONBREATH),
-	LEVEL_UP_MOVE(35, MOVE_CRUNCH),
-	LEVEL_UP_MOVE(40, MOVE_ENDEAVOR),
-	LEVEL_UP_MOVE(45, MOVE_UTURN),
-	LEVEL_UP_MOVE(51, MOVE_ROCKSLIDE),
-	LEVEL_UP_MOVE(56, MOVE_DRAGONCLAW),
-	LEVEL_UP_MOVE(61, MOVE_THRASH),
+	LEVEL_UP_MOVE(18, MOVE_QUICKGUARD),
+	LEVEL_UP_MOVE(21, MOVE_UTURN),
+	LEVEL_UP_MOVE(24, MOVE_ROCKSLIDE),
+	LEVEL_UP_MOVE(27, MOVE_SCARYFACE),
+	LEVEL_UP_MOVE(30, MOVE_CRUNCH),
+	LEVEL_UP_MOVE(33, MOVE_AGILITY),
+	LEVEL_UP_MOVE(36, MOVE_TAILWIND),
+	LEVEL_UP_MOVE(39, MOVE_ACROBATICS),
+	LEVEL_UP_MOVE(43, MOVE_DRAGONCLAW),
+	LEVEL_UP_MOVE(48, MOVE_FLYINGPRESS),
+	LEVEL_UP_MOVE(53, MOVE_ENDEAVOR),
 	LEVEL_UP_END
 };
 
@@ -11421,20 +11648,20 @@ static const struct LevelUpMove sGarbodorLevelUpLearnset[] = {
 static const struct LevelUpMove sZoruaLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_SCRATCH),
 	LEVEL_UP_MOVE( 1, MOVE_LEER),
-	LEVEL_UP_MOVE( 5, MOVE_PURSUIT),
-	LEVEL_UP_MOVE( 9, MOVE_FAKETEARS),
-	LEVEL_UP_MOVE(13, MOVE_FURYSWIPES),
-	LEVEL_UP_MOVE(17, MOVE_FEINTATTACK),
-	LEVEL_UP_MOVE(21, MOVE_SCARYFACE),
-	LEVEL_UP_MOVE(25, MOVE_TAUNT),
-	LEVEL_UP_MOVE(29, MOVE_FOULPLAY),
-	LEVEL_UP_MOVE(33, MOVE_TORMENT),
-	LEVEL_UP_MOVE(37, MOVE_AGILITY),
-	LEVEL_UP_MOVE(41, MOVE_EMBARGO),
-	LEVEL_UP_MOVE(45, MOVE_PUNISHMENT),
-	LEVEL_UP_MOVE(49, MOVE_NASTYPLOT),
-	LEVEL_UP_MOVE(53, MOVE_IMPRISON),
-	LEVEL_UP_MOVE(57, MOVE_NIGHTDAZE),
+	LEVEL_UP_MOVE( 3, MOVE_TORMENT),
+	LEVEL_UP_MOVE( 6, MOVE_PURSUIT),
+	LEVEL_UP_MOVE( 9, MOVE_HONECLAWS),
+	LEVEL_UP_MOVE(12, MOVE_FURYSWIPES),
+	LEVEL_UP_MOVE(15, MOVE_PUNISHMENT),
+	LEVEL_UP_MOVE(18, MOVE_SCARYFACE),
+	LEVEL_UP_MOVE(20, MOVE_TAUNT),
+	LEVEL_UP_MOVE(24, MOVE_KNOCKOFF),
+	LEVEL_UP_MOVE(28, MOVE_FAKETEARS),
+	LEVEL_UP_MOVE(32, MOVE_AGILITY),
+	LEVEL_UP_MOVE(36, MOVE_IMPRISON),
+	LEVEL_UP_MOVE(40, MOVE_NIGHTDAZE),
+	LEVEL_UP_MOVE(44, MOVE_NASTYPLOT),
+	LEVEL_UP_MOVE(48, MOVE_FOULPLAY),
 	LEVEL_UP_END
 };
 
@@ -11448,41 +11675,39 @@ static const struct LevelUpMove sZoroarkLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_LEER),
 	LEVEL_UP_MOVE( 1, MOVE_PURSUIT),
 	LEVEL_UP_MOVE( 1, MOVE_HONECLAWS),
-	LEVEL_UP_MOVE( 5, MOVE_PURSUIT),
-	LEVEL_UP_MOVE( 9, MOVE_HONECLAWS),
-	LEVEL_UP_MOVE(13, MOVE_FURYSWIPES),
-	LEVEL_UP_MOVE(17, MOVE_FEINTATTACK),
-	LEVEL_UP_MOVE(21, MOVE_SCARYFACE),
-	LEVEL_UP_MOVE(25, MOVE_TAUNT),
-	LEVEL_UP_MOVE(29, MOVE_FOULPLAY),
-	LEVEL_UP_MOVE(34, MOVE_TORMENT),
-	LEVEL_UP_MOVE(39, MOVE_AGILITY),
-	LEVEL_UP_MOVE(44, MOVE_EMBARGO),
-	LEVEL_UP_MOVE(49, MOVE_PUNISHMENT),
-	LEVEL_UP_MOVE(54, MOVE_NASTYPLOT),
-	LEVEL_UP_MOVE(59, MOVE_IMPRISON),
-	LEVEL_UP_MOVE(64, MOVE_NIGHTDAZE),
+	LEVEL_UP_MOVE(12, MOVE_FURYSWIPES),
+	LEVEL_UP_MOVE(15, MOVE_PUNISHMENT),
+	LEVEL_UP_MOVE(18, MOVE_SCARYFACE),
+	LEVEL_UP_MOVE(20, MOVE_TAUNT),
+	LEVEL_UP_MOVE(24, MOVE_KNOCKOFF),
+	LEVEL_UP_MOVE(28, MOVE_FAKETEARS),
+	LEVEL_UP_MOVE(29, MOVE_NIGHTSLASH),
+	LEVEL_UP_MOVE(34, MOVE_AGILITY),
+	LEVEL_UP_MOVE(40, MOVE_IMPRISON),
+	LEVEL_UP_MOVE(46, MOVE_NIGHTDAZE),
+	LEVEL_UP_MOVE(52, MOVE_NASTYPLOT),
+	LEVEL_UP_MOVE(58, MOVE_FOULPLAY),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sMinccinoLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_POUND),
-	LEVEL_UP_MOVE( 3, MOVE_BABYDOLLEYES),
-	LEVEL_UP_MOVE( 7, MOVE_HELPINGHAND),
-	LEVEL_UP_MOVE( 9, MOVE_TICKLE),
+	LEVEL_UP_MOVE( 1, MOVE_BABYDOLLEYES),
+	LEVEL_UP_MOVE( 3, MOVE_HELPINGHAND),
+	LEVEL_UP_MOVE( 6, MOVE_ECHOEDVOICE),
+	LEVEL_UP_MOVE(10, MOVE_SING),
 	LEVEL_UP_MOVE(13, MOVE_DOUBLESLAP),
-	LEVEL_UP_MOVE(15, MOVE_ENCORE),
-	LEVEL_UP_MOVE(19, MOVE_SWIFT),
-	LEVEL_UP_MOVE(21, MOVE_SING),
-	LEVEL_UP_MOVE(25, MOVE_TAILSLAP),
-	LEVEL_UP_MOVE(27, MOVE_CHARM),
-	LEVEL_UP_MOVE(31, MOVE_WAKEUPSLAP),
-	LEVEL_UP_MOVE(33, MOVE_ECHOEDVOICE),
-	LEVEL_UP_MOVE(37, MOVE_SLAM),
-	LEVEL_UP_MOVE(39, MOVE_CAPTIVATE),
-	LEVEL_UP_MOVE(43, MOVE_HYPERVOICE),
-	LEVEL_UP_MOVE(45, MOVE_LASTRESORT),
-	LEVEL_UP_MOVE(49, MOVE_AFTERYOU),
+	LEVEL_UP_MOVE(17, MOVE_CHARM),
+	LEVEL_UP_MOVE(20, MOVE_SWIFT),
+	LEVEL_UP_MOVE(24, MOVE_WAKEUPSLAP),
+	LEVEL_UP_MOVE(28, MOVE_ENCORE),
+	LEVEL_UP_MOVE(31, MOVE_TAILSLAP),
+	LEVEL_UP_MOVE(35, MOVE_AFTERYOU),
+	LEVEL_UP_MOVE(38, MOVE_CAPTIVATE),
+	LEVEL_UP_MOVE(41, MOVE_TICKLE),
+	LEVEL_UP_MOVE(44, MOVE_SLAM),
+	LEVEL_UP_MOVE(48, MOVE_HYPERVOICE),
+	LEVEL_UP_MOVE(52, MOVE_LASTRESORT),
 	LEVEL_UP_END
 };
 
@@ -12115,133 +12340,152 @@ static const struct LevelUpMove sTynamoLevelUpLearnset[] = {
 
 static const struct LevelUpMove sEelektrikLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 0, MOVE_CRUNCH),
-	LEVEL_UP_MOVE( 1, MOVE_CRUNCH),
-	LEVEL_UP_MOVE( 1, MOVE_HEADBUTT),
+	LEVEL_UP_MOVE( 1, MOVE_TACKLE),
 	LEVEL_UP_MOVE( 1, MOVE_THUNDERWAVE),
 	LEVEL_UP_MOVE( 1, MOVE_SPARK),
 	LEVEL_UP_MOVE( 1, MOVE_CHARGEBEAM),
+	LEVEL_UP_MOVE( 1, MOVE_HEADBUTT),
 	LEVEL_UP_MOVE( 9, MOVE_BIND),
 	LEVEL_UP_MOVE(19, MOVE_ACID),
 	LEVEL_UP_MOVE(29, MOVE_DISCHARGE),
-	LEVEL_UP_MOVE(44, MOVE_THUNDERBOLT),
-	LEVEL_UP_MOVE(49, MOVE_ACIDSPRAY),
-	LEVEL_UP_MOVE(54, MOVE_COIL),
-	LEVEL_UP_MOVE(59, MOVE_WILDCHARGE),
-	LEVEL_UP_MOVE(64, MOVE_GASTROACID),
-	LEVEL_UP_MOVE(69, MOVE_ZAPCANNON),
-	LEVEL_UP_MOVE(74, MOVE_THRASH),
+	LEVEL_UP_MOVE(38, MOVE_CRUNCH),
+	LEVEL_UP_MOVE(42, MOVE_THUNDERBOLT),
+	LEVEL_UP_MOVE(46, MOVE_ACIDSPRAY),
+	LEVEL_UP_MOVE(50, MOVE_COIL),
+	LEVEL_UP_MOVE(54, MOVE_WILDCHARGE),
+	LEVEL_UP_MOVE(58, MOVE_GASTROACID),
+	LEVEL_UP_MOVE(62, MOVE_ZAPCANNON),
+	LEVEL_UP_MOVE(66, MOVE_THRASH),
+	LEVEL_UP_MOVE(70, MOVE_THUNDERCAGE),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sEelektrossLevelUpLearnset[] = {
-	LEVEL_UP_MOVE( 1, MOVE_CRUNCH),
-	LEVEL_UP_MOVE( 1, MOVE_THRASH),
-	LEVEL_UP_MOVE( 1, MOVE_ZAPCANNON),
-	LEVEL_UP_MOVE( 1, MOVE_GASTROACID),
+	LEVEL_UP_MOVE( 0, MOVE_IONDELUGE),
+	LEVEL_UP_MOVE( 1, MOVE_TACKLE),
+	LEVEL_UP_MOVE( 1, MOVE_THUNDERWAVE),
+	LEVEL_UP_MOVE( 1, MOVE_SPARK),
+	LEVEL_UP_MOVE( 1, MOVE_CHARGEBEAM),
+	LEVEL_UP_MOVE( 1, MOVE_HEADBUTT),
+	LEVEL_UP_MOVE( 1, MOVE_BIND),
+	LEVEL_UP_MOVE( 1, MOVE_ACID),
+	LEVEL_UP_MOVE( 1, MOVE_THUNDERBOLT),
+	LEVEL_UP_MOVE( 1, MOVE_ACIDSPRAY),
 	LEVEL_UP_MOVE( 1, MOVE_COIL),
+	LEVEL_UP_MOVE( 1, MOVE_WILDCHARGE),
+	LEVEL_UP_MOVE( 1, MOVE_GASTROACID),
+	LEVEL_UP_MOVE( 1, MOVE_ZAPCANNON),
+	LEVEL_UP_MOVE( 1, MOVE_THRASH),
+	LEVEL_UP_MOVE( 1, MOVE_THUNDERCAGE),
 	LEVEL_UP_MOVE( 1, MOVE_IONDELUGE),
 	LEVEL_UP_MOVE( 1, MOVE_CRUSHCLAW),
-	LEVEL_UP_MOVE( 1, MOVE_HEADBUTT),
-	LEVEL_UP_MOVE( 1, MOVE_ACID),
 	LEVEL_UP_MOVE( 1, MOVE_DISCHARGE),
+	LEVEL_UP_MOVE( 1, MOVE_CRUNCH),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sElgyemLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_CONFUSION),
-	LEVEL_UP_MOVE( 4, MOVE_GROWL),
-	LEVEL_UP_MOVE( 8, MOVE_HEALBLOCK),
-	LEVEL_UP_MOVE(11, MOVE_MIRACLEEYE),
-	LEVEL_UP_MOVE(15, MOVE_PSYBEAM),
-	LEVEL_UP_MOVE(18, MOVE_HEADBUTT),
-	LEVEL_UP_MOVE(22, MOVE_HIDDENPOWER),
-	LEVEL_UP_MOVE(25, MOVE_IMPRISON),
-	LEVEL_UP_MOVE(29, MOVE_SIMPLEBEAM),
-	LEVEL_UP_MOVE(32, MOVE_ZENHEADBUTT),
-	LEVEL_UP_MOVE(36, MOVE_PSYCHUP),
-	LEVEL_UP_MOVE(39, MOVE_PSYCHIC),
-	LEVEL_UP_MOVE(43, MOVE_CALMMIND),
-	LEVEL_UP_MOVE(46, MOVE_RECOVER),
-	LEVEL_UP_MOVE(50, MOVE_GUARDSPLIT),
-	LEVEL_UP_MOVE(50, MOVE_POWERSPLIT),
-	LEVEL_UP_MOVE(53, MOVE_SYNCHRONOISE),
-	LEVEL_UP_MOVE(56, MOVE_WONDERROOM),
+	LEVEL_UP_MOVE( 1, MOVE_GROWL),
+	LEVEL_UP_MOVE( 4, MOVE_IMPRISON),
+	LEVEL_UP_MOVE( 7, MOVE_MIRACLEEYE),
+	LEVEL_UP_MOVE(10, MOVE_HEADBUTT),
+	LEVEL_UP_MOVE(14, MOVE_TELEPORT),
+	LEVEL_UP_MOVE(17, MOVE_PSYBEAM),
+	LEVEL_UP_MOVE(21, MOVE_SIMPLEBEAM),
+	LEVEL_UP_MOVE(24, MOVE_HIDDENPOWER),
+	LEVEL_UP_MOVE(28, MOVE_POWERSPLIT),
+	LEVEL_UP_MOVE(28, MOVE_GUARDSPLIT),	
+	LEVEL_UP_MOVE(31, MOVE_ZENHEADBUTT),
+	LEVEL_UP_MOVE(35, MOVE_RECOVER),
+	LEVEL_UP_MOVE(38, MOVE_HEALBLOCK),
+	LEVEL_UP_MOVE(41, MOVE_EXPANDINGFORCE),
+	LEVEL_UP_MOVE(45, MOVE_PSYCHUP),
+	LEVEL_UP_MOVE(48, MOVE_CALMMIND),
+	LEVEL_UP_MOVE(51, MOVE_PSYCHIC),
+	LEVEL_UP_MOVE(55, MOVE_WONDERROOM),
+	LEVEL_UP_MOVE(59, MOVE_SYNCHRONOISE),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sBeheeyemLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_PSYCHICTERRAIN),
-	LEVEL_UP_MOVE( 1, MOVE_WONDERROOM),
-	LEVEL_UP_MOVE( 1, MOVE_SYNCHRONOISE),
 	LEVEL_UP_MOVE( 1, MOVE_CONFUSION),
 	LEVEL_UP_MOVE( 1, MOVE_GROWL),
-	LEVEL_UP_MOVE( 1, MOVE_HEALBLOCK),
+	LEVEL_UP_MOVE( 1, MOVE_IMPRISON),
 	LEVEL_UP_MOVE( 1, MOVE_MIRACLEEYE),
-	LEVEL_UP_MOVE( 4, MOVE_GROWL),
-	LEVEL_UP_MOVE( 8, MOVE_HEALBLOCK),
-	LEVEL_UP_MOVE(11, MOVE_MIRACLEEYE),
-	LEVEL_UP_MOVE(15, MOVE_PSYBEAM),
-	LEVEL_UP_MOVE(18, MOVE_HEADBUTT),
-	LEVEL_UP_MOVE(22, MOVE_HIDDENPOWER),
-	LEVEL_UP_MOVE(25, MOVE_IMPRISON),
-	LEVEL_UP_MOVE(29, MOVE_SIMPLEBEAM),
-	LEVEL_UP_MOVE(32, MOVE_ZENHEADBUTT),
-	LEVEL_UP_MOVE(36, MOVE_PSYCHUP),
-	LEVEL_UP_MOVE(39, MOVE_PSYCHIC),
-	LEVEL_UP_MOVE(45, MOVE_CALMMIND),
-	LEVEL_UP_MOVE(50, MOVE_RECOVER),
-	LEVEL_UP_MOVE(56, MOVE_GUARDSPLIT),
-	LEVEL_UP_MOVE(58, MOVE_POWERSPLIT),
+	LEVEL_UP_MOVE(10, MOVE_HEADBUTT),
+	LEVEL_UP_MOVE(14, MOVE_TELEPORT),
+	LEVEL_UP_MOVE(17, MOVE_PSYBEAM),
+	LEVEL_UP_MOVE(21, MOVE_SIMPLEBEAM),
+	LEVEL_UP_MOVE(24, MOVE_HIDDENPOWER),
+	LEVEL_UP_MOVE(28, MOVE_POWERSPLIT),
+	LEVEL_UP_MOVE(28, MOVE_GUARDSPLIT),	
+	LEVEL_UP_MOVE(31, MOVE_ZENHEADBUTT),
+	LEVEL_UP_MOVE(35, MOVE_RECOVER),
+	LEVEL_UP_MOVE(38, MOVE_HEALBLOCK),
+	LEVEL_UP_MOVE(41, MOVE_EXPANDINGFORCE),
+	LEVEL_UP_MOVE(46, MOVE_PSYCHUP),
+	LEVEL_UP_MOVE(50, MOVE_CALMMIND),
+	LEVEL_UP_MOVE(54, MOVE_PSYCHIC),
+	LEVEL_UP_MOVE(59, MOVE_WONDERROOM),
 	LEVEL_UP_MOVE(63, MOVE_SYNCHRONOISE),
-	LEVEL_UP_MOVE(68, MOVE_WONDERROOM),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sLitwickLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_EMBER),
 	LEVEL_UP_MOVE( 1, MOVE_ASTONISH),
-	LEVEL_UP_MOVE( 3, MOVE_MINIMIZE),
-	LEVEL_UP_MOVE( 5, MOVE_SMOG),
-	LEVEL_UP_MOVE( 7, MOVE_FIRESPIN),
-	LEVEL_UP_MOVE(10, MOVE_CONFUSERAY),
-	LEVEL_UP_MOVE(13, MOVE_NIGHTSHADE),
-	LEVEL_UP_MOVE(16, MOVE_WILLOWISP),
-	LEVEL_UP_MOVE(20, MOVE_FLAMEBURST),
-	LEVEL_UP_MOVE(24, MOVE_IMPRISON),
-	LEVEL_UP_MOVE(28, MOVE_HEX),
-	LEVEL_UP_MOVE(33, MOVE_MEMENTO),
-	LEVEL_UP_MOVE(38, MOVE_INFERNO),
-	LEVEL_UP_MOVE(43, MOVE_CURSE),
-	LEVEL_UP_MOVE(49, MOVE_SHADOWBALL),
-	LEVEL_UP_MOVE(55, MOVE_PAINSPLIT),
-	LEVEL_UP_MOVE(61, MOVE_OVERHEAT),
+	LEVEL_UP_MOVE( 1, MOVE_SMOG),
+	LEVEL_UP_MOVE( 6, MOVE_MINIMIZE),
+	LEVEL_UP_MOVE( 9, MOVE_FIRESPIN),
+	LEVEL_UP_MOVE(13, MOVE_CONFUSERAY),
+	LEVEL_UP_MOVE(16, MOVE_HEX),
+	LEVEL_UP_MOVE(20, MOVE_WILLOWISP),
+	LEVEL_UP_MOVE(24, MOVE_FLAMEBURST),
+	LEVEL_UP_MOVE(28, MOVE_NIGHTSHADE),
+	LEVEL_UP_MOVE(32, MOVE_CURSE),
+	LEVEL_UP_MOVE(36, MOVE_SHADOWBALL),
+	LEVEL_UP_MOVE(40, MOVE_INFERNO),
+	LEVEL_UP_MOVE(44, MOVE_IMPRISON),
+	LEVEL_UP_MOVE(48, MOVE_PAINSPLIT),
+	LEVEL_UP_MOVE(52, MOVE_OVERHEAT),
+	LEVEL_UP_MOVE(56, MOVE_MEMENTO),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sLampentLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_EMBER),
 	LEVEL_UP_MOVE( 1, MOVE_ASTONISH),
-	LEVEL_UP_MOVE( 1, MOVE_MINIMIZE),
 	LEVEL_UP_MOVE( 1, MOVE_SMOG),
-	LEVEL_UP_MOVE( 3, MOVE_MINIMIZE),
-	LEVEL_UP_MOVE( 5, MOVE_SMOG),
-	LEVEL_UP_MOVE( 7, MOVE_FIRESPIN),
-	LEVEL_UP_MOVE(10, MOVE_CONFUSERAY),
-	LEVEL_UP_MOVE(13, MOVE_NIGHTSHADE),
-	LEVEL_UP_MOVE(16, MOVE_WILLOWISP),
-	LEVEL_UP_MOVE(20, MOVE_FLAMEBURST),
-	LEVEL_UP_MOVE(24, MOVE_IMPRISON),
-	LEVEL_UP_MOVE(28, MOVE_HEX),
-	LEVEL_UP_MOVE(33, MOVE_MEMENTO),
-	LEVEL_UP_MOVE(38, MOVE_INFERNO),
-	LEVEL_UP_MOVE(45, MOVE_CURSE),
-	LEVEL_UP_MOVE(53, MOVE_SHADOWBALL),
-	LEVEL_UP_MOVE(61, MOVE_PAINSPLIT),
-	LEVEL_UP_MOVE(69, MOVE_OVERHEAT),
+	LEVEL_UP_MOVE( 1, MOVE_MINIMIZE),
+	LEVEL_UP_MOVE( 9, MOVE_FIRESPIN),
+	LEVEL_UP_MOVE(13, MOVE_CONFUSERAY),
+	LEVEL_UP_MOVE(16, MOVE_HEX),
+	LEVEL_UP_MOVE(20, MOVE_WILLOWISP),
+	LEVEL_UP_MOVE(24, MOVE_FLAMEBURST),
+	LEVEL_UP_MOVE(28, MOVE_NIGHTSHADE),
+	LEVEL_UP_MOVE(32, MOVE_CURSE),
+	LEVEL_UP_MOVE(36, MOVE_SHADOWBALL),
+	LEVEL_UP_MOVE(40, MOVE_INFERNO),
+	LEVEL_UP_MOVE(46, MOVE_IMPRISON),
+	LEVEL_UP_MOVE(52, MOVE_PAINSPLIT),
+	LEVEL_UP_MOVE(58, MOVE_OVERHEAT),
+	LEVEL_UP_MOVE(64, MOVE_MEMENTO),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sChandelureLevelUpLearnset[] = {
+	LEVEL_UP_MOVE( 1, MOVE_EMBER),
+	LEVEL_UP_MOVE( 1, MOVE_ASTONISH),
+	LEVEL_UP_MOVE( 1, MOVE_SMOG),
+	LEVEL_UP_MOVE( 1, MOVE_MINIMIZE),
+	LEVEL_UP_MOVE( 1, MOVE_FIRESPIN),
+	LEVEL_UP_MOVE( 1, MOVE_NIGHTSHADE),
+	LEVEL_UP_MOVE( 1, MOVE_CURSE),
+	LEVEL_UP_MOVE( 1, MOVE_SHADOWBALL),
+	LEVEL_UP_MOVE( 1, MOVE_INFERNO),
+	LEVEL_UP_MOVE( 1, MOVE_IMPRISON),
 	LEVEL_UP_MOVE( 1, MOVE_PAINSPLIT),
 	LEVEL_UP_MOVE( 1, MOVE_SMOG),
 	LEVEL_UP_MOVE( 1, MOVE_CONFUSERAY),
@@ -12252,44 +12496,45 @@ static const struct LevelUpMove sChandelureLevelUpLearnset[] = {
 
 static const struct LevelUpMove sAxewLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_SCRATCH),
-	LEVEL_UP_MOVE( 4, MOVE_LEER),
-	LEVEL_UP_MOVE( 7, MOVE_ASSURANCE),
-	LEVEL_UP_MOVE(10, MOVE_DRAGONRAGE),
-	LEVEL_UP_MOVE(13, MOVE_DUALCHOP),
-	LEVEL_UP_MOVE(16, MOVE_SCARYFACE),
-	LEVEL_UP_MOVE(20, MOVE_SLASH),
-	LEVEL_UP_MOVE(24, MOVE_FALSESWIPE),
-	LEVEL_UP_MOVE(28, MOVE_DRAGONCLAW),
-	LEVEL_UP_MOVE(32, MOVE_DRAGONDANCE),
-	LEVEL_UP_MOVE(36, MOVE_TAUNT),
-	LEVEL_UP_MOVE(41, MOVE_DRAGONPULSE),
-	LEVEL_UP_MOVE(46, MOVE_SWORDSDANCE),
-	LEVEL_UP_MOVE(50, MOVE_GUILLOTINE),
-	LEVEL_UP_MOVE(56, MOVE_OUTRAGE),
-	LEVEL_UP_MOVE(61, MOVE_GIGAIMPACT),
+	LEVEL_UP_MOVE( 1, MOVE_LEER),
+	LEVEL_UP_MOVE( 4, MOVE_FALSESWIPE),
+	LEVEL_UP_MOVE( 8, MOVE_ASSURANCE),
+	LEVEL_UP_MOVE(12, MOVE_TAUNT),
+	LEVEL_UP_MOVE(15, MOVE_DRAGONPULSE),
+	LEVEL_UP_MOVE(18, MOVE_SLASH),
+	LEVEL_UP_MOVE(21, MOVE_SCARYFACE),
+	LEVEL_UP_MOVE(24, MOVE_DRAGONRAGE),
+	LEVEL_UP_MOVE(27, MOVE_CRUNCH),
+	LEVEL_UP_MOVE(30, MOVE_DRAGONDANCE),
+	LEVEL_UP_MOVE(33, MOVE_DUALCHOP),
+	LEVEL_UP_MOVE(36, MOVE_LASERFOCUS),
+	LEVEL_UP_MOVE(39, MOVE_DRAGONCLAW),
+	LEVEL_UP_MOVE(42, MOVE_SWORDSDANCE),
+	LEVEL_UP_MOVE(45, MOVE_OUTRAGE),
+	LEVEL_UP_MOVE(48, MOVE_GUILLOTINE),
+	LEVEL_UP_MOVE(51, MOVE_GIGAIMPACT),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sFraxureLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_SCRATCH),
 	LEVEL_UP_MOVE( 1, MOVE_LEER),
+	LEVEL_UP_MOVE( 1, MOVE_FALSESWIPE),
 	LEVEL_UP_MOVE( 1, MOVE_ASSURANCE),
-	LEVEL_UP_MOVE( 1, MOVE_DRAGONRAGE),
-	LEVEL_UP_MOVE( 4, MOVE_LEER),
-	LEVEL_UP_MOVE( 7, MOVE_ASSURANCE),
-	LEVEL_UP_MOVE(10, MOVE_DRAGONRAGE),
-	LEVEL_UP_MOVE(13, MOVE_DUALCHOP),
-	LEVEL_UP_MOVE(16, MOVE_SCARYFACE),
-	LEVEL_UP_MOVE(20, MOVE_SLASH),
-	LEVEL_UP_MOVE(24, MOVE_FALSESWIPE),
-	LEVEL_UP_MOVE(28, MOVE_DRAGONCLAW),
-	LEVEL_UP_MOVE(32, MOVE_DRAGONDANCE),
-	LEVEL_UP_MOVE(36, MOVE_TAUNT),
-	LEVEL_UP_MOVE(42, MOVE_DRAGONPULSE),
-	LEVEL_UP_MOVE(48, MOVE_SWORDSDANCE),
-	LEVEL_UP_MOVE(54, MOVE_GUILLOTINE),
-	LEVEL_UP_MOVE(60, MOVE_OUTRAGE),
-	LEVEL_UP_MOVE(66, MOVE_GIGAIMPACT),
+	LEVEL_UP_MOVE(12, MOVE_TAUNT),
+	LEVEL_UP_MOVE(15, MOVE_DRAGONPULSE),
+	LEVEL_UP_MOVE(18, MOVE_SLASH),
+	LEVEL_UP_MOVE(21, MOVE_SCARYFACE),
+	LEVEL_UP_MOVE(24, MOVE_DRAGONRAGE),
+	LEVEL_UP_MOVE(27, MOVE_CRUNCH),
+	LEVEL_UP_MOVE(30, MOVE_DRAGONDANCE),
+	LEVEL_UP_MOVE(33, MOVE_DUALCHOP),
+	LEVEL_UP_MOVE(36, MOVE_LASERFOCUS),
+	LEVEL_UP_MOVE(41, MOVE_DRAGONCLAW),
+	LEVEL_UP_MOVE(46, MOVE_SWORDSDANCE),
+	LEVEL_UP_MOVE(51, MOVE_OUTRAGE),
+	LEVEL_UP_MOVE(56, MOVE_GUILLOTINE),
+	LEVEL_UP_MOVE(61, MOVE_GIGAIMPACT),
 	LEVEL_UP_END
 };
 
@@ -12297,43 +12542,43 @@ static const struct LevelUpMove sHaxorusLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_OUTRAGE),
 	LEVEL_UP_MOVE( 1, MOVE_SCRATCH),
 	LEVEL_UP_MOVE( 1, MOVE_LEER),
+	LEVEL_UP_MOVE( 1, MOVE_FALSESWIPE),
 	LEVEL_UP_MOVE( 1, MOVE_ASSURANCE),
-	LEVEL_UP_MOVE( 1, MOVE_DRAGONRAGE),
-	LEVEL_UP_MOVE( 4, MOVE_LEER),
-	LEVEL_UP_MOVE( 7, MOVE_ASSURANCE),
-	LEVEL_UP_MOVE(10, MOVE_DRAGONRAGE),
-	LEVEL_UP_MOVE(13, MOVE_DUALCHOP),
-	LEVEL_UP_MOVE(16, MOVE_SCARYFACE),
-	LEVEL_UP_MOVE(20, MOVE_SLASH),
-	LEVEL_UP_MOVE(24, MOVE_FALSESWIPE),
-	LEVEL_UP_MOVE(28, MOVE_DRAGONCLAW),
-	LEVEL_UP_MOVE(32, MOVE_DRAGONDANCE),
-	LEVEL_UP_MOVE(36, MOVE_TAUNT),
-	LEVEL_UP_MOVE(42, MOVE_DRAGONPULSE),
-	LEVEL_UP_MOVE(50, MOVE_SWORDSDANCE),
-	LEVEL_UP_MOVE(58, MOVE_GUILLOTINE),
-	LEVEL_UP_MOVE(66, MOVE_OUTRAGE),
-	LEVEL_UP_MOVE(74, MOVE_GIGAIMPACT),
+	LEVEL_UP_MOVE(12, MOVE_TAUNT),
+	LEVEL_UP_MOVE(15, MOVE_DRAGONPULSE),
+	LEVEL_UP_MOVE(18, MOVE_SLASH),
+	LEVEL_UP_MOVE(21, MOVE_SCARYFACE),
+	LEVEL_UP_MOVE(24, MOVE_DRAGONRAGE),
+	LEVEL_UP_MOVE(27, MOVE_CRUNCH),
+	LEVEL_UP_MOVE(30, MOVE_DRAGONDANCE),
+	LEVEL_UP_MOVE(33, MOVE_DUALCHOP),
+	LEVEL_UP_MOVE(36, MOVE_LASERFOCUS),
+	LEVEL_UP_MOVE(41, MOVE_DRAGONCLAW),
+	LEVEL_UP_MOVE(46, MOVE_SWORDSDANCE),
+	LEVEL_UP_MOVE(53, MOVE_OUTRAGE),
+	LEVEL_UP_MOVE(60, MOVE_GUILLOTINE),
+	LEVEL_UP_MOVE(67, MOVE_GIGAIMPACT),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sCubchooLevelUpLearnset[] = {
+	LEVEL_UP_MOVE( 1, MOVE_BIDE),
+	LEVEL_UP_MOVE( 1, MOVE_POWDERSNOW),
 	LEVEL_UP_MOVE( 1, MOVE_GROWL),
-	LEVEL_UP_MOVE( 5, MOVE_POWDERSNOW),
-	LEVEL_UP_MOVE( 9, MOVE_BIDE),
-	LEVEL_UP_MOVE(13, MOVE_ICYWIND),
-	LEVEL_UP_MOVE(15, MOVE_PLAYNICE),
-	LEVEL_UP_MOVE(17, MOVE_FURYSWIPES),
-	LEVEL_UP_MOVE(21, MOVE_BRINE),
-	LEVEL_UP_MOVE(25, MOVE_ENDURE),
-	LEVEL_UP_MOVE(29, MOVE_CHARM),
-	LEVEL_UP_MOVE(33, MOVE_SLASH),
-	LEVEL_UP_MOVE(36, MOVE_FLAIL),
-	LEVEL_UP_MOVE(41, MOVE_REST),
-	LEVEL_UP_MOVE(45, MOVE_BLIZZARD),
-	LEVEL_UP_MOVE(49, MOVE_HAIL),
-	LEVEL_UP_MOVE(53, MOVE_THRASH),
-	LEVEL_UP_MOVE(57, MOVE_SHEERCOLD),
+	LEVEL_UP_MOVE( 3, MOVE_ENDURE),
+	LEVEL_UP_MOVE( 6, MOVE_FURYSWIPES),
+	LEVEL_UP_MOVE( 9, MOVE_ICYWIND),
+	LEVEL_UP_MOVE(12, MOVE_PLAYNICE),
+	LEVEL_UP_MOVE(15, MOVE_BRINE),
+	LEVEL_UP_MOVE(18, MOVE_SLASH),
+	LEVEL_UP_MOVE(21, MOVE_FROSTBREATH),
+	LEVEL_UP_MOVE(24, MOVE_FLAIL),
+	LEVEL_UP_MOVE(27, MOVE_CHARM),
+	LEVEL_UP_MOVE(30, MOVE_HAIL),
+	LEVEL_UP_MOVE(34, MOVE_THRASH),
+	LEVEL_UP_MOVE(38, MOVE_REST),
+	LEVEL_UP_MOVE(42, MOVE_ICEHAMMER),
+	LEVEL_UP_MOVE(46, MOVE_SHEERCOLD),
 	LEVEL_UP_END
 };
 
@@ -12345,24 +12590,22 @@ static const struct LevelUpMove sBearticLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_SUPERPOWER),
 	LEVEL_UP_MOVE( 1, MOVE_AQUAJET),
 	LEVEL_UP_MOVE( 1, MOVE_GROWL),
-	LEVEL_UP_MOVE( 1, MOVE_POWDERSNOW),
-	LEVEL_UP_MOVE( 1, MOVE_BIDE),
-	LEVEL_UP_MOVE( 1, MOVE_ICYWIND),
-	LEVEL_UP_MOVE( 5, MOVE_POWDERSNOW),
-	LEVEL_UP_MOVE( 9, MOVE_BIDE),
-	LEVEL_UP_MOVE(13, MOVE_ICYWIND),
-	LEVEL_UP_MOVE(15, MOVE_PLAYNICE),
-	LEVEL_UP_MOVE(17, MOVE_FURYSWIPES),
-	LEVEL_UP_MOVE(21, MOVE_BRINE),
-	LEVEL_UP_MOVE(25, MOVE_ENDURE),
-	LEVEL_UP_MOVE(29, MOVE_SWAGGER),
-	LEVEL_UP_MOVE(33, MOVE_SLASH),
-	LEVEL_UP_MOVE(36, MOVE_FLAIL),
-	LEVEL_UP_MOVE(41, MOVE_REST),
-	LEVEL_UP_MOVE(45, MOVE_BLIZZARD),
-	LEVEL_UP_MOVE(53, MOVE_HAIL),
-	LEVEL_UP_MOVE(59, MOVE_THRASH),
-	LEVEL_UP_MOVE(66, MOVE_SHEERCOLD),
+	LEVEL_UP_MOVE( 1, MOVE_ENDURE),
+	LEVEL_UP_MOVE( 1, MOVE_FURYSWIPES),
+	LEVEL_UP_MOVE( 9, MOVE_ICYWIND),
+	LEVEL_UP_MOVE(12, MOVE_PLAYNICE),
+	LEVEL_UP_MOVE(15, MOVE_BRINE),
+	LEVEL_UP_MOVE(18, MOVE_SLASH),
+	LEVEL_UP_MOVE(21, MOVE_FROSTBREATH),
+	LEVEL_UP_MOVE(24, MOVE_FLAIL),
+	LEVEL_UP_MOVE(27, MOVE_SWAGGER),
+	LEVEL_UP_MOVE(30, MOVE_HAIL),
+	LEVEL_UP_MOVE(34, MOVE_THRASH),
+	LEVEL_UP_MOVE(36, MOVE_ICICLECRASH),
+	LEVEL_UP_MOVE(40, MOVE_REST),
+	LEVEL_UP_MOVE(46, MOVE_ICEHAMMER),
+	LEVEL_UP_MOVE(52, MOVE_SHEERCOLD),
+	LEVEL_UP_MOVE(58, MOVE_SUPERPOWER),
 	LEVEL_UP_END
 };
 
@@ -12370,25 +12613,27 @@ static const struct LevelUpMove sCryogonalLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_SHEERCOLD),
 	LEVEL_UP_MOVE( 1, MOVE_NIGHTSLASH),
 	LEVEL_UP_MOVE( 1, MOVE_BIND),
-	LEVEL_UP_MOVE( 1, MOVE_ICESHARD),
+	LEVEL_UP_MOVE( 1, MOVE_REFLECTTYPE),
 	LEVEL_UP_MOVE( 1, MOVE_SHARPEN),
-	LEVEL_UP_MOVE( 1, MOVE_RAPIDSPIN),
-	LEVEL_UP_MOVE( 5, MOVE_ICYWIND),
-	LEVEL_UP_MOVE( 9, MOVE_MIST),
-	LEVEL_UP_MOVE( 9, MOVE_HAZE),
-	LEVEL_UP_MOVE(13, MOVE_AURORABEAM),
-	LEVEL_UP_MOVE(17, MOVE_ACIDARMOR),
-	LEVEL_UP_MOVE(21, MOVE_ANCIENTPOWER),
-	LEVEL_UP_MOVE(25, MOVE_ICEBEAM),
-	LEVEL_UP_MOVE(29, MOVE_LIGHTSCREEN),
-	LEVEL_UP_MOVE(33, MOVE_REFLECT),
-	LEVEL_UP_MOVE(37, MOVE_SLASH),
-	LEVEL_UP_MOVE(41, MOVE_CONFUSERAY),
-	LEVEL_UP_MOVE(45, MOVE_RECOVER),
-	LEVEL_UP_MOVE(49, MOVE_FREEZEDRY),
-	LEVEL_UP_MOVE(50, MOVE_SOLARBEAM),
-	LEVEL_UP_MOVE(53, MOVE_NIGHTSLASH),
-	LEVEL_UP_MOVE(57, MOVE_SHEERCOLD),
+	LEVEL_UP_MOVE( 1, MOVE_ICESHARD),
+	LEVEL_UP_MOVE( 4, MOVE_CONFUSERAY),
+	LEVEL_UP_MOVE( 8, MOVE_RAPIDSPIN),
+	LEVEL_UP_MOVE(12, MOVE_LASERFOCUS),
+	LEVEL_UP_MOVE(16, MOVE_ICYWIND),
+	LEVEL_UP_MOVE(20, MOVE_MIST),
+	LEVEL_UP_MOVE(20, MOVE_HAZE),
+	LEVEL_UP_MOVE(24, MOVE_ANCIENTPOWER),
+	LEVEL_UP_MOVE(28, MOVE_AURORABEAM),
+	LEVEL_UP_MOVE(32, MOVE_SLASH),
+	LEVEL_UP_MOVE(32, MOVE_NIGHTSLASH),
+	LEVEL_UP_MOVE(36, MOVE_FREEZEDRY),
+	LEVEL_UP_MOVE(40, MOVE_LIGHTSCREEN),
+	LEVEL_UP_MOVE(40, MOVE_REFLECT),
+	LEVEL_UP_MOVE(44, MOVE_RECOVER),
+	LEVEL_UP_MOVE(48, MOVE_ICEBEAM),
+	LEVEL_UP_MOVE(52, MOVE_ACIDARMOR),
+	LEVEL_UP_MOVE(56, MOVE_SOLARBEAM),
+	LEVEL_UP_MOVE(60, MOVE_SHEERCOLD),
 	LEVEL_UP_END
 };
 
@@ -12412,10 +12657,15 @@ static const struct LevelUpMove sShelmetLevelUpLearnset[] = {
 };
 
 static const struct LevelUpMove sAccelgorLevelUpLearnset[] = {
-	LEVEL_UP_MOVE( 1, MOVE_WATERSHURIKEN),
-	LEVEL_UP_MOVE( 1, MOVE_FINALGAMBIT),
-	LEVEL_UP_MOVE( 1, MOVE_POWERSWAP),
-	LEVEL_UP_MOVE( 1, MOVE_ABSORB),
+	LEVEL_UP_MOVE( 0, MOVE_WATERSHURIKEN),
+	LEVEL_UP_MOVE( 1, MOVE_ACID),
+	LEVEL_UP_MOVE( 1, MOVE_CURSE),
+	LEVEL_UP_MOVE( 1, MOVE_YAWN),
+	LEVEL_UP_MOVE( 1, MOVE_ACIDARMOR),
+	LEVEL_UP_MOVE( 1, MOVE_GUARDSWAP),
+	LEVEL_UP_MOVE( 1, MOVE_BODYSLAM),
+	LEVEL_UP_MOVE( 1, MOVE_LEECHLIFE),
+	LEVEL_UP_MOVE( 1, MOVE_DOUBLETEAM),
 	LEVEL_UP_MOVE( 1, MOVE_ACIDSPRAY),
 	LEVEL_UP_MOVE( 1, MOVE_DOUBLETEAM),
 	LEVEL_UP_MOVE( 1, MOVE_QUICKATTACK),
@@ -12437,45 +12687,50 @@ static const struct LevelUpMove sAccelgorLevelUpLearnset[] = {
 };
 
 static const struct LevelUpMove sStunfiskLevelUpLearnset[] = {
-	LEVEL_UP_MOVE( 1, MOVE_FISSURE),
-	LEVEL_UP_MOVE( 1, MOVE_FLAIL),
+	LEVEL_UP_MOVE( 1, MOVE_SNAPTRAP),
+	LEVEL_UP_MOVE( 1, MOVE_BIDE),
 	LEVEL_UP_MOVE( 1, MOVE_TACKLE),
-	LEVEL_UP_MOVE( 1, MOVE_WATERGUN),
 	LEVEL_UP_MOVE( 1, MOVE_MUDSLAP),
+	LEVEL_UP_MOVE( 1, MOVE_THUNDERSHOCK),
 	LEVEL_UP_MOVE( 1, MOVE_MUDSPORT),
-	LEVEL_UP_MOVE( 5, MOVE_BIDE),
-	LEVEL_UP_MOVE( 9, MOVE_THUNDERSHOCK),
-	LEVEL_UP_MOVE(13, MOVE_MUDSHOT),
-	LEVEL_UP_MOVE(17, MOVE_CAMOUFLAGE),
-	LEVEL_UP_MOVE(21, MOVE_MUDBOMB),
-	LEVEL_UP_MOVE(25, MOVE_DISCHARGE),
-	LEVEL_UP_MOVE(30, MOVE_ENDURE),
-	LEVEL_UP_MOVE(35, MOVE_BOUNCE),
-	LEVEL_UP_MOVE(40, MOVE_MUDDYWATER),
-	LEVEL_UP_MOVE(45, MOVE_THUNDERBOLT),
-	LEVEL_UP_MOVE(50, MOVE_REVENGE),
-	LEVEL_UP_MOVE(55, MOVE_FLAIL),
+	LEVEL_UP_MOVE( 4, MOVE_WATERGUN),
+	LEVEL_UP_MOVE( 8, MOVE_ENDURE),
+	LEVEL_UP_MOVE(11, MOVE_MUDSHOT),
+	LEVEL_UP_MOVE(15, MOVE_REVENGE),
+	LEVEL_UP_MOVE(19, MOVE_SHOCKWAVE),
+	LEVEL_UP_MOVE(23, MOVE_MUDBOMB),
+	LEVEL_UP_MOVE(27, MOVE_CHARGE),
+	LEVEL_UP_MOVE(30, MOVE_SUCKERPUNCH),
+	LEVEL_UP_MOVE(34, MOVE_ELECTRICTERRAIN),
+	LEVEL_UP_MOVE(37, MOVE_DISCHARGE),
+	LEVEL_UP_MOVE(41, MOVE_EARTHPOWER),
+	LEVEL_UP_MOVE(45, MOVE_CAMOUFLAGE),
+	LEVEL_UP_MOVE(49, MOVE_BOUNCE),
+	LEVEL_UP_MOVE(53, MOVE_MUDDYWATER),
+	LEVEL_UP_MOVE(57, MOVE_FLAIL),
 	LEVEL_UP_MOVE(61, MOVE_FISSURE),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sMienfooLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_POUND),
-	LEVEL_UP_MOVE( 5, MOVE_MEDITATE),
-	LEVEL_UP_MOVE( 9, MOVE_DETECT),
-	LEVEL_UP_MOVE(13, MOVE_FAKEOUT),
-	LEVEL_UP_MOVE(17, MOVE_DOUBLESLAP),
+	LEVEL_UP_MOVE( 1, MOVE_DETECT),
+	LEVEL_UP_MOVE( 5, MOVE_FAKEOUT),
+	LEVEL_UP_MOVE(10, MOVE_DOUBLESLAP),
+	LEVEL_UP_MOVE(14, MOVE_MEDITATE),
+	LEVEL_UP_MOVE(17, MOVE_FORCEPALM),
 	LEVEL_UP_MOVE(21, MOVE_SWIFT),
-	LEVEL_UP_MOVE(25, MOVE_CALMMIND),
-	LEVEL_UP_MOVE(29, MOVE_FORCEPALM),
-	LEVEL_UP_MOVE(33, MOVE_DRAINPUNCH),
-	LEVEL_UP_MOVE(37, MOVE_JUMPKICK),
-	LEVEL_UP_MOVE(41, MOVE_UTURN),
-	LEVEL_UP_MOVE(45, MOVE_QUICKGUARD),
-	LEVEL_UP_MOVE(49, MOVE_BOUNCE),
-	LEVEL_UP_MOVE(50, MOVE_HIGHJUMPKICK),
+	LEVEL_UP_MOVE(25, MOVE_QUICKGUARD),
+	LEVEL_UP_MOVE(28, MOVE_AURASPHERE),
+	LEVEL_UP_MOVE(32, MOVE_UTURN),
+	LEVEL_UP_MOVE(36, MOVE_DRAINPUNCH),
+	LEVEL_UP_MOVE(40, MOVE_CALMMIND),
+	LEVEL_UP_MOVE(43, MOVE_JUMPKICK),
+	LEVEL_UP_MOVE(47, MOVE_HONECLAWS),
+	LEVEL_UP_MOVE(50, MOVE_BOUNCE),
+	LEVEL_UP_MOVE(54, MOVE_ENDURE),
 	LEVEL_UP_MOVE(57, MOVE_REVERSAL),
-	LEVEL_UP_MOVE(61, MOVE_AURASPHERE),
+	LEVEL_UP_MOVE(61, MOVE_HIGHJUMPKICK),
 	LEVEL_UP_END
 };
 
@@ -12483,44 +12738,44 @@ static const struct LevelUpMove sMienshaoLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_AURASPHERE),
 	LEVEL_UP_MOVE( 1, MOVE_REVERSAL),
 	LEVEL_UP_MOVE( 1, MOVE_POUND),
-	LEVEL_UP_MOVE( 1, MOVE_MEDITATE),
 	LEVEL_UP_MOVE( 1, MOVE_DETECT),
 	LEVEL_UP_MOVE( 1, MOVE_FAKEOUT),
-	LEVEL_UP_MOVE( 5, MOVE_MEDITATE),
-	LEVEL_UP_MOVE( 9, MOVE_DETECT),
-	LEVEL_UP_MOVE(13, MOVE_FAKEOUT),
-	LEVEL_UP_MOVE(17, MOVE_DOUBLESLAP),
+	LEVEL_UP_MOVE( 1, MOVE_DOUBLESLAP),
+	LEVEL_UP_MOVE(14, MOVE_MEDITATE),
+	LEVEL_UP_MOVE(17, MOVE_FORCEPALM),
 	LEVEL_UP_MOVE(21, MOVE_SWIFT),
-	LEVEL_UP_MOVE(25, MOVE_CALMMIND),
-	LEVEL_UP_MOVE(29, MOVE_FORCEPALM),
-	LEVEL_UP_MOVE(33, MOVE_DRAINPUNCH),
-	LEVEL_UP_MOVE(37, MOVE_JUMPKICK),
-	LEVEL_UP_MOVE(41, MOVE_UTURN),
-	LEVEL_UP_MOVE(45, MOVE_WIDEGUARD),
-	LEVEL_UP_MOVE(49, MOVE_BOUNCE),
-	LEVEL_UP_MOVE(56, MOVE_HIGHJUMPKICK),
-	LEVEL_UP_MOVE(63, MOVE_REVERSAL),
-	LEVEL_UP_MOVE(70, MOVE_AURASPHERE),
+	LEVEL_UP_MOVE(25, MOVE_WIDEGUARD),
+	LEVEL_UP_MOVE(28, MOVE_AURASPHERE),
+	LEVEL_UP_MOVE(32, MOVE_UTURN),
+	LEVEL_UP_MOVE(36, MOVE_DRAINPUNCH),
+	LEVEL_UP_MOVE(40, MOVE_CALMMIND),
+	LEVEL_UP_MOVE(43, MOVE_JUMPKICK),
+	LEVEL_UP_MOVE(47, MOVE_HONECLAWS),
+	LEVEL_UP_MOVE(50, MOVE_BOUNCE),
+	LEVEL_UP_MOVE(56, MOVE_ENDURE),
+	LEVEL_UP_MOVE(61, MOVE_REVERSAL),
+	LEVEL_UP_MOVE(67, MOVE_HIGHJUMPKICK),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sDruddigonLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_LEER),
-	LEVEL_UP_MOVE( 1, MOVE_SCRATCH),
-	LEVEL_UP_MOVE( 5, MOVE_HONECLAWS),
-	LEVEL_UP_MOVE( 9, MOVE_BITE),
-	LEVEL_UP_MOVE(13, MOVE_SCARYFACE),
-	LEVEL_UP_MOVE(18, MOVE_DRAGONRAGE),
-	LEVEL_UP_MOVE(21, MOVE_SLASH),
-	LEVEL_UP_MOVE(25, MOVE_CRUNCH),
-	LEVEL_UP_MOVE(27, MOVE_DRAGONCLAW),
-	LEVEL_UP_MOVE(31, MOVE_CHIPAWAY),
-	LEVEL_UP_MOVE(35, MOVE_REVENGE),
-	LEVEL_UP_MOVE(40, MOVE_NIGHTSLASH),
-	LEVEL_UP_MOVE(45, MOVE_DRAGONTAIL),
-	LEVEL_UP_MOVE(49, MOVE_ROCKCLIMB),
-	LEVEL_UP_MOVE(55, MOVE_SUPERPOWER),
-	LEVEL_UP_MOVE(62, MOVE_OUTRAGE),
+	LEVEL_UP_MOVE( 4, MOVE_BITE),
+	LEVEL_UP_MOVE( 8, MOVE_DRAGONTAIL),
+	LEVEL_UP_MOVE(12, MOVE_METALCLAW),
+	LEVEL_UP_MOVE(16, MOVE_SCARYFACE),
+	LEVEL_UP_MOVE(20, MOVE_SLASH),
+	LEVEL_UP_MOVE(24, MOVE_DRAGONRAGE),
+	LEVEL_UP_MOVE(28, MOVE_DRAGONCLAW),
+	LEVEL_UP_MOVE(32, MOVE_CRUSHCLAW),
+	LEVEL_UP_MOVE(36, MOVE_HONECLAWS),
+	LEVEL_UP_MOVE(40, MOVE_REVENGE),
+	LEVEL_UP_MOVE(45, MOVE_CRUNCH),
+	LEVEL_UP_MOVE(50, MOVE_DRAGONHAMMER),
+	LEVEL_UP_MOVE(55, MOVE_ROCKCLIMB),
+	LEVEL_UP_MOVE(60, MOVE_IRONHEAD),
+	LEVEL_UP_MOVE(65, MOVE_SUPERPOWER),
+	LEVEL_UP_MOVE(70, MOVE_OUTRAGE),
 	LEVEL_UP_END
 };
 
@@ -12571,183 +12826,171 @@ static const struct LevelUpMove sGolurkLevelUpLearnset[] = {
 
 static const struct LevelUpMove sPawniardLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_SCRATCH),
-	LEVEL_UP_MOVE( 6, MOVE_LEER),
-	LEVEL_UP_MOVE( 9, MOVE_FURYCUTTER),
-	LEVEL_UP_MOVE(14, MOVE_TORMENT),
-	LEVEL_UP_MOVE(17, MOVE_FEINTATTACK),
-	LEVEL_UP_MOVE(22, MOVE_SCARYFACE),
-	LEVEL_UP_MOVE(25, MOVE_METALCLAW),
-	LEVEL_UP_MOVE(30, MOVE_SLASH),
-	LEVEL_UP_MOVE(33, MOVE_ASSURANCE),
-	LEVEL_UP_MOVE(38, MOVE_METALSOUND),
-	LEVEL_UP_MOVE(41, MOVE_EMBARGO),
-	LEVEL_UP_MOVE(46, MOVE_IRONDEFENSE),
-	LEVEL_UP_MOVE(49, MOVE_NIGHTSLASH),
-	LEVEL_UP_MOVE(54, MOVE_IRONHEAD),
-	LEVEL_UP_MOVE(57, MOVE_SWORDSDANCE),
-	LEVEL_UP_MOVE(62, MOVE_GUILLOTINE),
+	LEVEL_UP_MOVE( 1, MOVE_LEER),
+	LEVEL_UP_MOVE( 4, MOVE_FURYCUTTER),
+	LEVEL_UP_MOVE( 8, MOVE_PURSUIT),
+	LEVEL_UP_MOVE(12, MOVE_TORMENT),
+	LEVEL_UP_MOVE(15, MOVE_METALCLAW),
+	LEVEL_UP_MOVE(23, MOVE_SCARYFACE),
+	LEVEL_UP_MOVE(27, MOVE_SLASH),
+	LEVEL_UP_MOVE(32, MOVE_ASSURANCE),
+	LEVEL_UP_MOVE(37, MOVE_METALSOUND),
+	LEVEL_UP_MOVE(41, MOVE_REVENGE),
+	LEVEL_UP_MOVE(46, MOVE_LASERFOCUS),
+	LEVEL_UP_MOVE(50, MOVE_IRONDEFENSE),
+	LEVEL_UP_MOVE(54, MOVE_NIGHTSLASH),
+	LEVEL_UP_MOVE(59, MOVE_SWORDSDANCE),
+	LEVEL_UP_MOVE(63, MOVE_IRONHEAD),
+	LEVEL_UP_MOVE(68, MOVE_GUILLOTINE),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sBisharpLevelUpLearnset[] = {
-	LEVEL_UP_MOVE( 1, MOVE_GUILLOTINE),
-	LEVEL_UP_MOVE( 1, MOVE_IRONHEAD),
 	LEVEL_UP_MOVE( 1, MOVE_METALBURST),
 	LEVEL_UP_MOVE( 1, MOVE_SCRATCH),
 	LEVEL_UP_MOVE( 1, MOVE_LEER),
 	LEVEL_UP_MOVE( 1, MOVE_FURYCUTTER),
-	LEVEL_UP_MOVE( 1, MOVE_TORMENT),
-	LEVEL_UP_MOVE( 6, MOVE_LEER),
-	LEVEL_UP_MOVE( 9, MOVE_FURYCUTTER),
-	LEVEL_UP_MOVE(14, MOVE_TORMENT),
-	LEVEL_UP_MOVE(17, MOVE_FEINTATTACK),
-	LEVEL_UP_MOVE(22, MOVE_SCARYFACE),
-	LEVEL_UP_MOVE(25, MOVE_METALCLAW),
-	LEVEL_UP_MOVE(30, MOVE_SLASH),
-	LEVEL_UP_MOVE(33, MOVE_ASSURANCE),
-	LEVEL_UP_MOVE(38, MOVE_METALSOUND),
-	LEVEL_UP_MOVE(41, MOVE_EMBARGO),
-	LEVEL_UP_MOVE(46, MOVE_IRONDEFENSE),
-	LEVEL_UP_MOVE(49, MOVE_NIGHTSLASH),
-	LEVEL_UP_MOVE(57, MOVE_IRONHEAD),
-	LEVEL_UP_MOVE(63, MOVE_SWORDSDANCE),
-	LEVEL_UP_MOVE(71, MOVE_GUILLOTINE),
+	LEVEL_UP_MOVE( 1, MOVE_PURSUIT),
+	LEVEL_UP_MOVE(12, MOVE_TORMENT),
+	LEVEL_UP_MOVE(15, MOVE_METALCLAW),
+	LEVEL_UP_MOVE(23, MOVE_SCARYFACE),
+	LEVEL_UP_MOVE(27, MOVE_SLASH),	
+	LEVEL_UP_MOVE(32, MOVE_ASSURANCE),
+	LEVEL_UP_MOVE(37, MOVE_METALSOUND),
+	LEVEL_UP_MOVE(41, MOVE_REVENGE),
+	LEVEL_UP_MOVE(46, MOVE_LASERFOCUS),
+	LEVEL_UP_MOVE(50, MOVE_IRONDEFENSE),
+	LEVEL_UP_MOVE(56, MOVE_NIGHTSLASH),
+	LEVEL_UP_MOVE(62, MOVE_SWORDSDANCE),
+	LEVEL_UP_MOVE(67, MOVE_IRONHEAD),
+	LEVEL_UP_MOVE(73, MOVE_GUILLOTINE),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sBouffalantLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_PURSUIT),
 	LEVEL_UP_MOVE( 1, MOVE_LEER),
-	LEVEL_UP_MOVE( 6, MOVE_RAGE),
-	LEVEL_UP_MOVE(11, MOVE_FURYATTACK),
-	LEVEL_UP_MOVE(16, MOVE_HORNATTACK),
-	LEVEL_UP_MOVE(21, MOVE_SCARYFACE),
-	LEVEL_UP_MOVE(26, MOVE_REVENGE),
-	LEVEL_UP_MOVE(31, MOVE_HEADCHARGE),
-	LEVEL_UP_MOVE(36, MOVE_FOCUSENERGY),
-	LEVEL_UP_MOVE(41, MOVE_MEGAHORN),
-	LEVEL_UP_MOVE(46, MOVE_REVERSAL),
-	LEVEL_UP_MOVE(50, MOVE_THRASH),
-	LEVEL_UP_MOVE(56, MOVE_SWORDSDANCE),
-	LEVEL_UP_MOVE(61, MOVE_GIGAIMPACT),
+	LEVEL_UP_MOVE( 5, MOVE_FOCUSENERGY),
+	LEVEL_UP_MOVE( 9, MOVE_FURYATTACK),
+	LEVEL_UP_MOVE(14, MOVE_REVENGE),
+	LEVEL_UP_MOVE(19, MOVE_SCARYFACE),
+	LEVEL_UP_MOVE(23, MOVE_HORNATTACK),
+	LEVEL_UP_MOVE(28, MOVE_REVERSAL),
+	LEVEL_UP_MOVE(33, MOVE_THROATCHOP),
+	LEVEL_UP_MOVE(38, MOVE_HEADCHARGE),
+	LEVEL_UP_MOVE(43, MOVE_SWORDSDANCE),
+	LEVEL_UP_MOVE(47, MOVE_THRASH),
+	LEVEL_UP_MOVE(52, MOVE_MEGAHORN),
+	LEVEL_UP_MOVE(57, MOVE_GIGAIMPACT),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sRuffletLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_PECK),
 	LEVEL_UP_MOVE( 1, MOVE_LEER),
-	LEVEL_UP_MOVE( 5, MOVE_FURYATTACK),
+	LEVEL_UP_MOVE( 6, MOVE_HONECLAWS),
 	LEVEL_UP_MOVE(10, MOVE_WINGATTACK),
-	LEVEL_UP_MOVE(14, MOVE_HONECLAWS),
-	LEVEL_UP_MOVE(19, MOVE_SCARYFACE),
-	LEVEL_UP_MOVE(23, MOVE_AERIALACE),
-	LEVEL_UP_MOVE(28, MOVE_SLASH),
-	LEVEL_UP_MOVE(32, MOVE_DEFOG),
-	LEVEL_UP_MOVE(37, MOVE_TAILWIND),
-	LEVEL_UP_MOVE(41, MOVE_AIRSLASH),
-	LEVEL_UP_MOVE(46, MOVE_CRUSHCLAW),
-	LEVEL_UP_MOVE(50, MOVE_SKYDROP),
-	LEVEL_UP_MOVE(55, MOVE_WHIRLWIND),
-	LEVEL_UP_MOVE(59, MOVE_BRAVEBIRD),
-	LEVEL_UP_MOVE(64, MOVE_THRASH),
+	LEVEL_UP_MOVE(15, MOVE_FURYATTACK),
+	LEVEL_UP_MOVE(20, MOVE_TAILWIND),
+	LEVEL_UP_MOVE(24, MOVE_AIRSLASH),
+	LEVEL_UP_MOVE(29, MOVE_SCARYFACE),
+	LEVEL_UP_MOVE(33, MOVE_SKYDROP),
+	LEVEL_UP_MOVE(38, MOVE_SLASH),
+	LEVEL_UP_MOVE(43, MOVE_WHIRLWIND),
+	LEVEL_UP_MOVE(47, MOVE_DUALWINGBEAT),
+	LEVEL_UP_MOVE(52, MOVE_CRUSHCLAW),
+	LEVEL_UP_MOVE(57, MOVE_DEFOG),
+	LEVEL_UP_MOVE(61, MOVE_THRASH),
+	LEVEL_UP_MOVE(66, MOVE_BRAVEBIRD),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sBraviaryLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 0, MOVE_SUPERPOWER),
-	LEVEL_UP_MOVE( 1, MOVE_SUPERPOWER),
-	LEVEL_UP_MOVE( 1, MOVE_THRASH),
-	LEVEL_UP_MOVE( 1, MOVE_BRAVEBIRD),
-	LEVEL_UP_MOVE( 1, MOVE_WHIRLWIND),
+	LEVEL_UP_MOVE( 1, MOVE_SKYATTACK),
 	LEVEL_UP_MOVE( 1, MOVE_PECK),
 	LEVEL_UP_MOVE( 1, MOVE_LEER),
-	LEVEL_UP_MOVE( 1, MOVE_FURYATTACK),
-	LEVEL_UP_MOVE( 1, MOVE_WINGATTACK),
-	LEVEL_UP_MOVE( 5, MOVE_FURYATTACK),
+	LEVEL_UP_MOVE( 6, MOVE_HONECLAWS),
 	LEVEL_UP_MOVE(10, MOVE_WINGATTACK),
-	LEVEL_UP_MOVE(14, MOVE_HONECLAWS),
-	LEVEL_UP_MOVE(19, MOVE_SCARYFACE),
-	LEVEL_UP_MOVE(23, MOVE_AERIALACE),
-	LEVEL_UP_MOVE(28, MOVE_SLASH),
-	LEVEL_UP_MOVE(32, MOVE_DEFOG),
-	LEVEL_UP_MOVE(37, MOVE_TAILWIND),
-	LEVEL_UP_MOVE(41, MOVE_AIRSLASH),
-	LEVEL_UP_MOVE(46, MOVE_CRUSHCLAW),
-	LEVEL_UP_MOVE(50, MOVE_SKYDROP),
-	LEVEL_UP_MOVE(57, MOVE_WHIRLWIND),
-	LEVEL_UP_MOVE(63, MOVE_BRAVEBIRD),
-	LEVEL_UP_MOVE(70, MOVE_THRASH),
+	LEVEL_UP_MOVE(15, MOVE_FURYATTACK),
+	LEVEL_UP_MOVE(20, MOVE_TAILWIND),
+	LEVEL_UP_MOVE(24, MOVE_AIRSLASH),
+	LEVEL_UP_MOVE(29, MOVE_SCARYFACE),
+	LEVEL_UP_MOVE(33, MOVE_SKYDROP),
+	LEVEL_UP_MOVE(38, MOVE_SLASH),
+	LEVEL_UP_MOVE(43, MOVE_WHIRLWIND),
+	LEVEL_UP_MOVE(47, MOVE_DUALWINGBEAT),
+	LEVEL_UP_MOVE(52, MOVE_CRUSHCLAW),
+	LEVEL_UP_MOVE(53, MOVE_SUPERPOWER),
+	LEVEL_UP_MOVE(59, MOVE_DEFOG),
+	LEVEL_UP_MOVE(64, MOVE_THRASH),
+	LEVEL_UP_MOVE(70, MOVE_BRAVEBIRD),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sVullabyLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_GUST),
 	LEVEL_UP_MOVE( 1, MOVE_LEER),
-	LEVEL_UP_MOVE( 5, MOVE_FURYATTACK),
+	LEVEL_UP_MOVE( 6, MOVE_FLATTER),
 	LEVEL_UP_MOVE(10, MOVE_PLUCK),
-	LEVEL_UP_MOVE(14, MOVE_NASTYPLOT),
-	LEVEL_UP_MOVE(19, MOVE_FLATTER),
-	LEVEL_UP_MOVE(23, MOVE_FEINTATTACK),
-	LEVEL_UP_MOVE(28, MOVE_PUNISHMENT),
-	LEVEL_UP_MOVE(32, MOVE_DEFOG),
-	LEVEL_UP_MOVE(37, MOVE_TAILWIND),
-	LEVEL_UP_MOVE(41, MOVE_AIRSLASH),
-	LEVEL_UP_MOVE(46, MOVE_DARKPULSE),
-	LEVEL_UP_MOVE(50, MOVE_EMBARGO),
-	LEVEL_UP_MOVE(55, MOVE_WHIRLWIND),
-	LEVEL_UP_MOVE(59, MOVE_BRAVEBIRD),
-	LEVEL_UP_MOVE(64, MOVE_MIRRORMOVE),
+	LEVEL_UP_MOVE(15, MOVE_FURYATTACK),
+	LEVEL_UP_MOVE(20, MOVE_TAILWIND),
+	LEVEL_UP_MOVE(24, MOVE_PUNISHMENT),
+	LEVEL_UP_MOVE(29, MOVE_IRONDEFENSE),
+	LEVEL_UP_MOVE(33, MOVE_AIRSLASH),
+	LEVEL_UP_MOVE(38, MOVE_KNOCKOFF),
+	LEVEL_UP_MOVE(43, MOVE_WHIRLWIND),
+	LEVEL_UP_MOVE(47, MOVE_NASTYPLOT),
+	LEVEL_UP_MOVE(51, MOVE_DARKPULSE),
+	LEVEL_UP_MOVE(56, MOVE_DEFOG),
+	LEVEL_UP_MOVE(60, MOVE_MIRRORMOVE),
+	LEVEL_UP_MOVE(64, MOVE_BRAVEBIRD),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sMandibuzzLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 0, MOVE_BONERUSH),
-	LEVEL_UP_MOVE( 1, MOVE_BONERUSH),
-	LEVEL_UP_MOVE( 1, MOVE_MIRRORMOVE),
-	LEVEL_UP_MOVE( 1, MOVE_BRAVEBIRD),
-	LEVEL_UP_MOVE( 1, MOVE_WHIRLWIND),
 	LEVEL_UP_MOVE( 1, MOVE_GUST),
 	LEVEL_UP_MOVE( 1, MOVE_LEER),
-	LEVEL_UP_MOVE( 1, MOVE_FURYATTACK),
-	LEVEL_UP_MOVE( 1, MOVE_PLUCK),
-	LEVEL_UP_MOVE( 5, MOVE_FURYATTACK),
+	LEVEL_UP_MOVE( 6, MOVE_FLATTER),
 	LEVEL_UP_MOVE(10, MOVE_PLUCK),
-	LEVEL_UP_MOVE(14, MOVE_NASTYPLOT),
-	LEVEL_UP_MOVE(19, MOVE_FLATTER),
-	LEVEL_UP_MOVE(23, MOVE_FEINTATTACK),
-	LEVEL_UP_MOVE(28, MOVE_PUNISHMENT),
-	LEVEL_UP_MOVE(32, MOVE_DEFOG),
-	LEVEL_UP_MOVE(37, MOVE_TAILWIND),
-	LEVEL_UP_MOVE(41, MOVE_AIRSLASH),
-	LEVEL_UP_MOVE(46, MOVE_DARKPULSE),
-	LEVEL_UP_MOVE(50, MOVE_EMBARGO),
-	LEVEL_UP_MOVE(57, MOVE_WHIRLWIND),
-	LEVEL_UP_MOVE(63, MOVE_BRAVEBIRD),
-	LEVEL_UP_MOVE(70, MOVE_MIRRORMOVE),
+	LEVEL_UP_MOVE(15, MOVE_FURYATTACK),
+	LEVEL_UP_MOVE(20, MOVE_TAILWIND),
+	LEVEL_UP_MOVE(24, MOVE_PUNISHMENT),
+	LEVEL_UP_MOVE(29, MOVE_IRONDEFENSE),
+	LEVEL_UP_MOVE(33, MOVE_AIRSLASH),
+	LEVEL_UP_MOVE(38, MOVE_KNOCKOFF),
+	LEVEL_UP_MOVE(43, MOVE_WHIRLWIND),
+	LEVEL_UP_MOVE(47, MOVE_NASTYPLOT),
+	LEVEL_UP_MOVE(51, MOVE_DARKPULSE),
+	LEVEL_UP_MOVE(53, MOVE_BONERUSH),
+	LEVEL_UP_MOVE(58, MOVE_DEFOG),
+	LEVEL_UP_MOVE(63, MOVE_MIRRORMOVE),
+	LEVEL_UP_MOVE(68, MOVE_BRAVEBIRD),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sHeatmorLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_HONECLAWS),
 	LEVEL_UP_MOVE( 1, MOVE_TACKLE),
-	LEVEL_UP_MOVE( 1, MOVE_INCINERATE),
-	LEVEL_UP_MOVE( 1, MOVE_LICK),
-	LEVEL_UP_MOVE( 6, MOVE_ODORSLEUTH),
-	LEVEL_UP_MOVE(11, MOVE_BIND),
-	LEVEL_UP_MOVE(16, MOVE_FIRESPIN),
-	LEVEL_UP_MOVE(21, MOVE_FURYSWIPES),
-	LEVEL_UP_MOVE(26, MOVE_SNATCH),
-	LEVEL_UP_MOVE(31, MOVE_FLAMEBURST),
-	LEVEL_UP_MOVE(36, MOVE_BUGBITE),
-	LEVEL_UP_MOVE(41, MOVE_SLASH),
-	LEVEL_UP_MOVE(44, MOVE_FIRELASH),
-	LEVEL_UP_MOVE(47, MOVE_AMNESIA),
-	LEVEL_UP_MOVE(50, MOVE_FLAMETHROWER),
-	LEVEL_UP_MOVE(56, MOVE_STOCKPILE),
-	LEVEL_UP_MOVE(56, MOVE_SPITUP),
-	LEVEL_UP_MOVE(56, MOVE_SWALLOW),
-	LEVEL_UP_MOVE(61, MOVE_FLAREBLITZ),
-	LEVEL_UP_MOVE(66, MOVE_INFERNO),
+	LEVEL_UP_MOVE( 4, MOVE_FIRESPIN),
+	LEVEL_UP_MOVE( 8, MOVE_ODORSLEUTH),
+	LEVEL_UP_MOVE(11, MOVE_FURYSWIPES),
+	LEVEL_UP_MOVE(15, MOVE_BUGBITE),
+	LEVEL_UP_MOVE(19, MOVE_INCINERATE),
+	LEVEL_UP_MOVE(23, MOVE_STOCKPILE),
+	LEVEL_UP_MOVE(23, MOVE_SWALLOW),
+	LEVEL_UP_MOVE(23, MOVE_SPITUP),
+	LEVEL_UP_MOVE(26, MOVE_SLASH),
+	LEVEL_UP_MOVE(30, MOVE_FLAMEBURST),
+	LEVEL_UP_MOVE(34, MOVE_SNATCH),
+	LEVEL_UP_MOVE(37, MOVE_FIRELASH),
+	LEVEL_UP_MOVE(41, MOVE_HONECLAWS),
+	LEVEL_UP_MOVE(44, MOVE_BODYSLAM),
+	LEVEL_UP_MOVE(48, MOVE_AMNESIA),
+	LEVEL_UP_MOVE(51, MOVE_FLAMETHROWER),
+	LEVEL_UP_MOVE(55, MOVE_INFERNO),
+	LEVEL_UP_MOVE(59, MOVE_FLAREBLITZ),
 	LEVEL_UP_END
 };
 
@@ -12841,26 +13084,29 @@ static const struct LevelUpMove sHydreigonLevelUpLearnset[] = {
 static const struct LevelUpMove sLarvestaLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_EMBER),
 	LEVEL_UP_MOVE( 1, MOVE_STRINGSHOT),
-	LEVEL_UP_MOVE(10, MOVE_ABSORB),
-	LEVEL_UP_MOVE(20, MOVE_TAKEDOWN),
-	LEVEL_UP_MOVE(30, MOVE_FLAMECHARGE),
-	LEVEL_UP_MOVE(40, MOVE_BUGBITE),
-	LEVEL_UP_MOVE(50, MOVE_DOUBLEEDGE),
-	LEVEL_UP_MOVE(60, MOVE_FLAMEWHEEL),
-	LEVEL_UP_MOVE(70, MOVE_BUGBUZZ),
-	LEVEL_UP_MOVE(80, MOVE_AMNESIA),
-	LEVEL_UP_MOVE(90, MOVE_THRASH),
-	LEVEL_UP_MOVE(100, MOVE_FLAREBLITZ),
+	LEVEL_UP_MOVE( 6, MOVE_LEECHLIFE),
+	LEVEL_UP_MOVE(10, MOVE_FLAMECHARGE),
+	LEVEL_UP_MOVE(15, MOVE_STRUGGLEBUG),
+	LEVEL_UP_MOVE(20, MOVE_SCREECH),
+	LEVEL_UP_MOVE(24, MOVE_BUGBITE),
+	LEVEL_UP_MOVE(29, MOVE_FLAMEWHEEL),
+	LEVEL_UP_MOVE(34, MOVE_LEECHFANG),
+	LEVEL_UP_MOVE(39, MOVE_TAKEDOWN),
+	LEVEL_UP_MOVE(44, MOVE_AMNESIA),
+	LEVEL_UP_MOVE(48, MOVE_DOUBLEEDGE),
+	LEVEL_UP_MOVE(53, MOVE_BUGBUZZ),
+	LEVEL_UP_MOVE(58, MOVE_FLAREBLITZ),
+	LEVEL_UP_MOVE(63, MOVE_THRASH),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sVolcaronaLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 0, MOVE_QUIVERDANCE),
-	LEVEL_UP_MOVE( 1, MOVE_QUIVERDANCE),
-	LEVEL_UP_MOVE( 1, MOVE_FIERYDANCE),
-	LEVEL_UP_MOVE( 1, MOVE_HURRICANE),
-	LEVEL_UP_MOVE( 1, MOVE_RAGEPOWDER),
-	LEVEL_UP_MOVE( 1, MOVE_HEATWAVE),
+	LEVEL_UP_MOVE( 1, MOVE_WHIRLWIND),
+	LEVEL_UP_MOVE( 1, MOVE_EMBER),
+	LEVEL_UP_MOVE( 1, MOVE_FLAMECHARGE),
+	LEVEL_UP_MOVE( 1, MOVE_TAKEDOWN),
+	LEVEL_UP_MOVE( 1, MOVE_DOUBLEEDGE),
 	LEVEL_UP_MOVE( 1, MOVE_FLAREBLITZ),
 	LEVEL_UP_MOVE( 1, MOVE_THRASH),
 	LEVEL_UP_MOVE( 1, MOVE_AMNESIA),
@@ -12868,18 +13114,22 @@ static const struct LevelUpMove sVolcaronaLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_FLAMEWHEEL),
 	LEVEL_UP_MOVE( 1, MOVE_EMBER),
 	LEVEL_UP_MOVE( 1, MOVE_STRINGSHOT),
-	LEVEL_UP_MOVE( 1, MOVE_ABSORB),
+	LEVEL_UP_MOVE( 1, MOVE_LEECHLIFE),
 	LEVEL_UP_MOVE( 1, MOVE_GUST),
-	LEVEL_UP_MOVE(10, MOVE_ABSORB),
-	LEVEL_UP_MOVE(20, MOVE_GUST),
-	LEVEL_UP_MOVE(30, MOVE_FIRESPIN),
-	LEVEL_UP_MOVE(40, MOVE_WHIRLWIND),
-	LEVEL_UP_MOVE(50, MOVE_SILVERWIND),
-	LEVEL_UP_MOVE(60, MOVE_HEATWAVE),
-	LEVEL_UP_MOVE(70, MOVE_BUGBUZZ),
-	LEVEL_UP_MOVE(80, MOVE_RAGEPOWDER),
-	LEVEL_UP_MOVE(90, MOVE_HURRICANE),
-	LEVEL_UP_MOVE(100, MOVE_FIERYDANCE),
+	LEVEL_UP_MOVE(15, MOVE_STRUGGLEBUG),
+	LEVEL_UP_MOVE(20, MOVE_SCREECH),
+	LEVEL_UP_MOVE(24, MOVE_BUGBITE),
+	LEVEL_UP_MOVE(29, MOVE_FLAMEWHEEL),
+	LEVEL_UP_MOVE(34, MOVE_LEECHFANG),
+	LEVEL_UP_MOVE(39, MOVE_SILVERWIND),
+	LEVEL_UP_MOVE(44, MOVE_AMNESIA),
+	LEVEL_UP_MOVE(48, MOVE_HEATWAVE),
+	LEVEL_UP_MOVE(53, MOVE_BUGBUZZ),
+	LEVEL_UP_MOVE(58, MOVE_FIREBLAST),
+	LEVEL_UP_MOVE(58, MOVE_QUIVERDANCE),
+	LEVEL_UP_MOVE(65, MOVE_HURRICANE),
+	LEVEL_UP_MOVE(72, MOVE_RAGEPOWDER),
+	LEVEL_UP_MOVE(79, MOVE_FIERYDANCE),
 	LEVEL_UP_END
 };
 
@@ -13074,6 +13324,8 @@ static const struct LevelUpMove sKyuremLevelUpLearnset[] = {
 };
 
 static const struct LevelUpMove sKeldeoLevelUpLearnset[] = {
+	LEVEL_UP_MOVE( 1, MOVE_SECRETSWORD),
+	LEVEL_UP_MOVE( 1, MOVE_AURORABEAM),
 	LEVEL_UP_MOVE( 1, MOVE_AQUAJET),
 	LEVEL_UP_MOVE( 1, MOVE_LEER),
 	LEVEL_UP_MOVE( 1, MOVE_DOUBLEKICK),
@@ -13107,11 +13359,12 @@ static const struct LevelUpMove sMeloettaLevelUpLearnset[] = {
 	LEVEL_UP_MOVE(36, MOVE_ECHOEDVOICE),
 	LEVEL_UP_MOVE(43, MOVE_UTURN),
 	LEVEL_UP_MOVE(50, MOVE_WAKEUPSLAP),
-	LEVEL_UP_MOVE(57, MOVE_PSYCHIC),
+	LEVEL_UP_MOVE(57, MOVE_LUSTERPURGE),
 	LEVEL_UP_MOVE(64, MOVE_HYPERVOICE),
 	LEVEL_UP_MOVE(71, MOVE_ROLEPLAY),
 	LEVEL_UP_MOVE(78, MOVE_CLOSECOMBAT),
-	LEVEL_UP_MOVE(85, MOVE_PERISHSONG),
+	LEVEL_UP_MOVE(85, MOVE_PSYCHIC),
+	LEVEL_UP_MOVE(92, MOVE_PERISHSONG),
 	LEVEL_UP_END
 };
 
@@ -13144,14 +13397,16 @@ static const struct LevelUpMove sShadowWarriorLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_INCINERATE),
 	LEVEL_UP_MOVE(30, MOVE_SLASH),
 	LEVEL_UP_MOVE(30, MOVE_DRAGONCLAW),
-	LEVEL_UP_MOVE(30, MOVE_SHADOWCLAW),
-	LEVEL_UP_MOVE(50, MOVE_PHANTOMFORCE),
+	LEVEL_UP_MOVE(50, MOVE_FLAMETHROWER),
+	LEVEL_UP_MOVE(50, MOVE_SHADOWBONE),
+	LEVEL_UP_MOVE(60, MOVE_SWORDSDANCE),
+	LEVEL_UP_MOVE(60, MOVE_POISONJAB),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sWormadamSandyLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 0, MOVE_QUIVERDANCE),
-	LEVEL_UP_MOVE( 1, MOVE_QUIVERDANCE),
+	LEVEL_UP_MOVE( 1, MOVE_ANCIENTPOWER),
 	LEVEL_UP_MOVE( 1, MOVE_SUCKERPUNCH),
 	LEVEL_UP_MOVE( 1, MOVE_TACKLE),
 	LEVEL_UP_MOVE( 1, MOVE_PROTECT),
@@ -13174,7 +13429,7 @@ static const struct LevelUpMove sWormadamSandyLevelUpLearnset[] = {
 
 static const struct LevelUpMove sWormadamTrashLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 0, MOVE_QUIVERDANCE),
-	LEVEL_UP_MOVE( 1, MOVE_QUIVERDANCE),
+	LEVEL_UP_MOVE( 1, MOVE_ANCIENTPOWER),
 	LEVEL_UP_MOVE( 1, MOVE_METALBURST),
 	LEVEL_UP_MOVE( 1, MOVE_SUCKERPUNCH),
 	LEVEL_UP_MOVE( 1, MOVE_TACKLE),
@@ -13198,6 +13453,7 @@ static const struct LevelUpMove sWormadamTrashLevelUpLearnset[] = {
 
 static const struct LevelUpMove sShayminSkyLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_GROWTH),
+	LEVEL_UP_MOVE( 5, MOVE_FLORALHEALING),
 	LEVEL_UP_MOVE(10, MOVE_MAGICALLEAF),
 	LEVEL_UP_MOVE(19, MOVE_LEECHSEED),
 	LEVEL_UP_MOVE(28, MOVE_QUICKATTACK),
@@ -13324,65 +13580,64 @@ static const struct LevelUpMove sFennekinLevelUpLearnset[] = {
 	LEVEL_UP_MOVE(14, MOVE_FLAMECHARGE),
 	LEVEL_UP_MOVE(17, MOVE_PSYBEAM),
 	LEVEL_UP_MOVE(20, MOVE_FIRESPIN),
-	LEVEL_UP_MOVE(25, MOVE_LUCKYCHANT),
-	LEVEL_UP_MOVE(27, MOVE_LIGHTSCREEN),
-	LEVEL_UP_MOVE(31, MOVE_PSYSHOCK),
+	LEVEL_UP_MOVE(23, MOVE_LUCKYCHANT),
+	LEVEL_UP_MOVE(25, MOVE_INCINERATE),
+	LEVEL_UP_MOVE(28, MOVE_LIGHTSCREEN),
+	LEVEL_UP_MOVE(30, MOVE_PSYSHOCK),
+	LEVEL_UP_MOVE(33, MOVE_WILLOWISP),
 	LEVEL_UP_MOVE(35, MOVE_FLAMETHROWER),
-	LEVEL_UP_MOVE(38, MOVE_WILLOWISP),
-	LEVEL_UP_MOVE(41, MOVE_PSYCHIC),
+	LEVEL_UP_MOVE(38, MOVE_MAGICROOM),
+	LEVEL_UP_MOVE(40, MOVE_PSYCHIC),
 	LEVEL_UP_MOVE(43, MOVE_SUNNYDAY),
-	LEVEL_UP_MOVE(46, MOVE_MAGICROOM),
-	LEVEL_UP_MOVE(48, MOVE_FIREBLAST),
+	LEVEL_UP_MOVE(45, MOVE_FIREBLAST),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sBraixenLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_SCRATCH),
 	LEVEL_UP_MOVE( 1, MOVE_TAILWHIP),
-	LEVEL_UP_MOVE( 1, MOVE_EMBER),
 	LEVEL_UP_MOVE( 5, MOVE_EMBER),
 	LEVEL_UP_MOVE(11, MOVE_HOWL),
 	LEVEL_UP_MOVE(14, MOVE_FLAMECHARGE),
 	LEVEL_UP_MOVE(18, MOVE_PSYBEAM),
 	LEVEL_UP_MOVE(22, MOVE_FIRESPIN),
-	LEVEL_UP_MOVE(28, MOVE_LUCKYCHANT),
-	LEVEL_UP_MOVE(31, MOVE_LIGHTSCREEN),
+	LEVEL_UP_MOVE(26, MOVE_LUCKYCHANT),
+	LEVEL_UP_MOVE(29, MOVE_INCINERATE),
+	LEVEL_UP_MOVE(33, MOVE_LIGHTSCREEN),
 	LEVEL_UP_MOVE(36, MOVE_PSYSHOCK),
-	LEVEL_UP_MOVE(41, MOVE_FLAMETHROWER),
-	LEVEL_UP_MOVE(45, MOVE_WILLOWISP),
-	LEVEL_UP_MOVE(49, MOVE_PSYCHIC),
-	LEVEL_UP_MOVE(52, MOVE_SUNNYDAY),
-	LEVEL_UP_MOVE(56, MOVE_MAGICROOM),
-	LEVEL_UP_MOVE(59, MOVE_FIREBLAST),
+	LEVEL_UP_MOVE(40, MOVE_WILLOWISP),
+	LEVEL_UP_MOVE(43, MOVE_FLAMETHROWER),
+	LEVEL_UP_MOVE(47, MOVE_MAGICROOM),
+	LEVEL_UP_MOVE(50, MOVE_PSYCHIC),
+	LEVEL_UP_MOVE(54, MOVE_SUNNYDAY),
+	LEVEL_UP_MOVE(57, MOVE_FIREBLAST),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sDelphoxLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 0, MOVE_MYSTICALFIRE),
-	LEVEL_UP_MOVE( 1, MOVE_MYSTICALFIRE),
-	LEVEL_UP_MOVE( 1, MOVE_FUTURESIGHT),
 	LEVEL_UP_MOVE( 1, MOVE_ROLEPLAY),
 	LEVEL_UP_MOVE( 1, MOVE_SWITCHEROO),
 	LEVEL_UP_MOVE( 1, MOVE_SHADOWBALL),
 	LEVEL_UP_MOVE( 1, MOVE_SCRATCH),
 	LEVEL_UP_MOVE( 1, MOVE_TAILWHIP),
-	LEVEL_UP_MOVE( 1, MOVE_EMBER),
-	LEVEL_UP_MOVE( 1, MOVE_HOWL),
 	LEVEL_UP_MOVE( 5, MOVE_EMBER),
 	LEVEL_UP_MOVE(11, MOVE_HOWL),
 	LEVEL_UP_MOVE(14, MOVE_FLAMECHARGE),
 	LEVEL_UP_MOVE(18, MOVE_PSYBEAM),
 	LEVEL_UP_MOVE(22, MOVE_FIRESPIN),
-	LEVEL_UP_MOVE(28, MOVE_LUCKYCHANT),
-	LEVEL_UP_MOVE(31, MOVE_LIGHTSCREEN),
-	LEVEL_UP_MOVE(38, MOVE_PSYSHOCK),
-	LEVEL_UP_MOVE(45, MOVE_FLAMETHROWER),
-	LEVEL_UP_MOVE(51, MOVE_WILLOWISP),
-	LEVEL_UP_MOVE(57, MOVE_PSYCHIC),
-	LEVEL_UP_MOVE(62, MOVE_SUNNYDAY),
-	LEVEL_UP_MOVE(68, MOVE_MAGICROOM),
-	LEVEL_UP_MOVE(74, MOVE_FIREBLAST),
-	LEVEL_UP_MOVE(80, MOVE_FUTURESIGHT),
+	LEVEL_UP_MOVE(26, MOVE_LUCKYCHANT),
+	LEVEL_UP_MOVE(29, MOVE_INCINERATE),
+	LEVEL_UP_MOVE(33, MOVE_LIGHTSCREEN),
+	LEVEL_UP_MOVE(35, MOVE_MYSTICALFIRE),
+	LEVEL_UP_MOVE(36, MOVE_PSYSHOCK),
+	LEVEL_UP_MOVE(42, MOVE_WILLOWISP),
+	LEVEL_UP_MOVE(46, MOVE_FLAMETHROWER),
+	LEVEL_UP_MOVE(51, MOVE_MAGICROOM),
+	LEVEL_UP_MOVE(55, MOVE_PSYCHIC),
+	LEVEL_UP_MOVE(60, MOVE_SUNNYDAY),
+	LEVEL_UP_MOVE(64, MOVE_FIREBLAST),
+	LEVEL_UP_MOVE(69, MOVE_FUTURESIGHT),
 	LEVEL_UP_END
 };
 
@@ -13390,17 +13645,18 @@ static const struct LevelUpMove sFroakieLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_POUND),
 	LEVEL_UP_MOVE( 1, MOVE_GROWL),
 	LEVEL_UP_MOVE( 5, MOVE_BUBBLE),
-	LEVEL_UP_MOVE( 8, MOVE_QUICKATTACK),
-	LEVEL_UP_MOVE(10, MOVE_LICK),
+	LEVEL_UP_MOVE( 8, MOVE_LICK),
+	LEVEL_UP_MOVE(11, MOVE_QUICKATTACK),
 	LEVEL_UP_MOVE(14, MOVE_WATERPULSE),
-	LEVEL_UP_MOVE(18, MOVE_SMOKESCREEN),
-	LEVEL_UP_MOVE(21, MOVE_ROUND),
-	LEVEL_UP_MOVE(25, MOVE_FLING),
-	LEVEL_UP_MOVE(29, MOVE_SMACKDOWN),
+	LEVEL_UP_MOVE(17, MOVE_FLING),
+	LEVEL_UP_MOVE(20, MOVE_ROUND),
+	LEVEL_UP_MOVE(23, MOVE_SMOKESCREEN),
+	LEVEL_UP_MOVE(26, MOVE_SMACKDOWN),
+	LEVEL_UP_MOVE(29, MOVE_DOUBLETEAM),
+	LEVEL_UP_MOVE(32, MOVE_WATERFALL),
 	LEVEL_UP_MOVE(35, MOVE_SUBSTITUTE),
-	LEVEL_UP_MOVE(39, MOVE_BOUNCE),
-	LEVEL_UP_MOVE(43, MOVE_DOUBLETEAM),
-	LEVEL_UP_MOVE(48, MOVE_HYDROPUMP),
+	LEVEL_UP_MOVE(38, MOVE_BOUNCE),
+	LEVEL_UP_MOVE(41, MOVE_HYDROPUMP),
 	LEVEL_UP_END
 };
 
@@ -13408,18 +13664,18 @@ static const struct LevelUpMove sFrogadierLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_POUND),
 	LEVEL_UP_MOVE( 1, MOVE_GROWL),
 	LEVEL_UP_MOVE( 1, MOVE_BUBBLE),
-	LEVEL_UP_MOVE( 5, MOVE_BUBBLE),
-	LEVEL_UP_MOVE( 8, MOVE_QUICKATTACK),
-	LEVEL_UP_MOVE(10, MOVE_LICK),
+	LEVEL_UP_MOVE( 1, MOVE_LICK),
+	LEVEL_UP_MOVE(11, MOVE_QUICKATTACK),
 	LEVEL_UP_MOVE(14, MOVE_WATERPULSE),
-	LEVEL_UP_MOVE(19, MOVE_SMOKESCREEN),
-	LEVEL_UP_MOVE(23, MOVE_ROUND),
-	LEVEL_UP_MOVE(28, MOVE_FLING),
-	LEVEL_UP_MOVE(33, MOVE_SMACKDOWN),
-	LEVEL_UP_MOVE(40, MOVE_SUBSTITUTE),
-	LEVEL_UP_MOVE(45, MOVE_BOUNCE),
-	LEVEL_UP_MOVE(50, MOVE_DOUBLETEAM),
-	LEVEL_UP_MOVE(56, MOVE_HYDROPUMP),
+	LEVEL_UP_MOVE(18, MOVE_FLING),
+	LEVEL_UP_MOVE(22, MOVE_ROUND),
+	LEVEL_UP_MOVE(26, MOVE_SMOKESCREEN),
+	LEVEL_UP_MOVE(30, MOVE_SMACKDOWN),
+	LEVEL_UP_MOVE(34, MOVE_DOUBLETEAM),
+	LEVEL_UP_MOVE(38, MOVE_WATERFALL),
+	LEVEL_UP_MOVE(42, MOVE_SUBSTITUTE),
+	LEVEL_UP_MOVE(46, MOVE_BOUNCE),
+	LEVEL_UP_MOVE(50, MOVE_HYDROPUMP),
 	LEVEL_UP_END
 };
 
@@ -13430,87 +13686,96 @@ static const struct LevelUpMove sGreninjaLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_HAZE),
 	LEVEL_UP_MOVE( 1, MOVE_ROLEPLAY),
 	LEVEL_UP_MOVE( 1, MOVE_MATBLOCK),
+	LEVEL_UP_MOVE( 1, MOVE_FLING),
+	LEVEL_UP_MOVE( 1, MOVE_ROUND),
+	LEVEL_UP_MOVE( 1, MOVE_SMACKDOWN),
+	LEVEL_UP_MOVE( 1, MOVE_SUBSTITUTE),
+	LEVEL_UP_MOVE( 1, MOVE_BOUNCE),
 	LEVEL_UP_MOVE( 1, MOVE_POUND),
 	LEVEL_UP_MOVE( 1, MOVE_GROWL),
 	LEVEL_UP_MOVE( 1, MOVE_BUBBLE),
-	LEVEL_UP_MOVE( 1, MOVE_QUICKATTACK),
-	LEVEL_UP_MOVE( 5, MOVE_BUBBLE),
-	LEVEL_UP_MOVE( 8, MOVE_QUICKATTACK),
-	LEVEL_UP_MOVE(10, MOVE_LICK),
+	LEVEL_UP_MOVE( 1, MOVE_LICK),
+	LEVEL_UP_MOVE(11, MOVE_QUICKATTACK),
 	LEVEL_UP_MOVE(14, MOVE_WATERPULSE),
-	LEVEL_UP_MOVE(19, MOVE_SMOKESCREEN),
-	LEVEL_UP_MOVE(23, MOVE_SHADOWSNEAK),
-	LEVEL_UP_MOVE(28, MOVE_SPIKES),
-	LEVEL_UP_MOVE(33, MOVE_FEINTATTACK),
-	LEVEL_UP_MOVE(42, MOVE_SUBSTITUTE),
-	LEVEL_UP_MOVE(49, MOVE_EXTRASENSORY),
-	LEVEL_UP_MOVE(56, MOVE_DOUBLETEAM),
-	LEVEL_UP_MOVE(68, MOVE_HYDROPUMP),
-	LEVEL_UP_MOVE(70, MOVE_HAZE),
-	LEVEL_UP_MOVE(77, MOVE_NIGHTSLASH),
+	LEVEL_UP_MOVE(18, MOVE_SHADOWSNEAK),
+	LEVEL_UP_MOVE(22, MOVE_FEINTATTACK),
+	LEVEL_UP_MOVE(26, MOVE_SMOKESCREEN),
+	LEVEL_UP_MOVE(30, MOVE_SPIKES),
+	LEVEL_UP_MOVE(34, MOVE_DOUBLETEAM),
+	LEVEL_UP_MOVE(35, MOVE_WATERSHURIKEN),
+	LEVEL_UP_MOVE(40, MOVE_NIGHTSLASH),
+	LEVEL_UP_MOVE(45, MOVE_WATERFALL),
+	LEVEL_UP_MOVE(50, MOVE_EXTRASENSORY),
+	LEVEL_UP_MOVE(55, MOVE_DARKPULSE),
+	LEVEL_UP_MOVE(60, MOVE_HAZE),
+	LEVEL_UP_MOVE(65, MOVE_HYDROPUMP),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sBunnelbyLevelUpLearnset[] = {
-	LEVEL_UP_MOVE( 1, MOVE_TACKLE),
-	LEVEL_UP_MOVE( 1, MOVE_AGILITY),
+	LEVEL_UP_MOVE( 1, MOVE_ODORSLEUTH),
+	LEVEL_UP_MOVE( 1, MOVE_MUDSLAP),
 	LEVEL_UP_MOVE( 1, MOVE_LEER),
-	LEVEL_UP_MOVE( 7, MOVE_QUICKATTACK),
-	LEVEL_UP_MOVE(10, MOVE_DOUBLESLAP),
-	LEVEL_UP_MOVE(13, MOVE_MUDSLAP),
-	LEVEL_UP_MOVE(15, MOVE_TAKEDOWN),
-	LEVEL_UP_MOVE(18, MOVE_MUDSHOT),
-	LEVEL_UP_MOVE(20, MOVE_DOUBLEKICK),
-	LEVEL_UP_MOVE(25, MOVE_ODORSLEUTH),
-	LEVEL_UP_MOVE(29, MOVE_FLAIL),
-	LEVEL_UP_MOVE(33, MOVE_DIG),
-	LEVEL_UP_MOVE(38, MOVE_BOUNCE),
-	LEVEL_UP_MOVE(42, MOVE_SUPERFANG),
-	LEVEL_UP_MOVE(47, MOVE_FACADE),
-	LEVEL_UP_MOVE(49, MOVE_EARTHQUAKE),
+	LEVEL_UP_MOVE( 3, MOVE_TACKLE),
+	LEVEL_UP_MOVE( 6, MOVE_LASERFOCUS),
+	LEVEL_UP_MOVE( 9, MOVE_QUICKATTACK),
+	LEVEL_UP_MOVE(12, MOVE_MUDSHOT),
+	LEVEL_UP_MOVE(15, MOVE_DOUBLESLAP),
+	LEVEL_UP_MOVE(18, MOVE_DOUBLEKICK),
+	LEVEL_UP_MOVE(21, MOVE_BULLDOZE),
+	LEVEL_UP_MOVE(24, MOVE_FACADE),
+	LEVEL_UP_MOVE(27, MOVE_DIG),
+	LEVEL_UP_MOVE(30, MOVE_BOUNCE),
+	LEVEL_UP_MOVE(33, MOVE_AGILITY),
+	LEVEL_UP_MOVE(36, MOVE_TAKEDOWN),
+	LEVEL_UP_MOVE(39, MOVE_SWORDSDANCE),
+	LEVEL_UP_MOVE(42, MOVE_FLAIL),
+	LEVEL_UP_MOVE(45, MOVE_EARTHQUAKE),
+	LEVEL_UP_MOVE(48, MOVE_SUPERFANG),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sDiggersbyLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_HAMMERARM),
 	LEVEL_UP_MOVE( 1, MOVE_ROTOTILLER),
-	LEVEL_UP_MOVE( 1, MOVE_BULLDOZE),
-	LEVEL_UP_MOVE( 1, MOVE_SWORDSDANCE),
-	LEVEL_UP_MOVE( 1, MOVE_TACKLE),
-	LEVEL_UP_MOVE( 1, MOVE_AGILITY),
+	LEVEL_UP_MOVE( 1, MOVE_FLAIL),
+	LEVEL_UP_MOVE( 1, MOVE_ODORSLEUTH),
+	LEVEL_UP_MOVE( 1, MOVE_MUDSLAP),
 	LEVEL_UP_MOVE( 1, MOVE_LEER),
-	LEVEL_UP_MOVE( 7, MOVE_QUICKATTACK),
-	LEVEL_UP_MOVE(13, MOVE_DOUBLESLAP),
-	LEVEL_UP_MOVE(13, MOVE_MUDSLAP),
-	LEVEL_UP_MOVE(15, MOVE_TAKEDOWN),
-	LEVEL_UP_MOVE(18, MOVE_MUDSHOT),
-	LEVEL_UP_MOVE(21, MOVE_DOUBLEKICK),
-	LEVEL_UP_MOVE(27, MOVE_ODORSLEUTH),
-	LEVEL_UP_MOVE(32, MOVE_FLAIL),
-	LEVEL_UP_MOVE(37, MOVE_DIG),
-	LEVEL_UP_MOVE(43, MOVE_BOUNCE),
-	LEVEL_UP_MOVE(48, MOVE_SUPERFANG),
-	LEVEL_UP_MOVE(54, MOVE_FACADE),
-	LEVEL_UP_MOVE(57, MOVE_EARTHQUAKE),
-	LEVEL_UP_MOVE(60, MOVE_HAMMERARM),
+	LEVEL_UP_MOVE( 3, MOVE_TACKLE),
+	LEVEL_UP_MOVE( 6, MOVE_LASERFOCUS),
+	LEVEL_UP_MOVE( 9, MOVE_QUICKATTACK),
+	LEVEL_UP_MOVE(12, MOVE_MUDSHOT),
+	LEVEL_UP_MOVE(15, MOVE_DOUBLESLAP),
+	LEVEL_UP_MOVE(18, MOVE_DOUBLEKICK),
+	LEVEL_UP_MOVE(23, MOVE_BULLDOZE),
+	LEVEL_UP_MOVE(27, MOVE_FACADE),
+	LEVEL_UP_MOVE(31, MOVE_DIG),
+	LEVEL_UP_MOVE(35, MOVE_BOUNCE),
+	LEVEL_UP_MOVE(39, MOVE_AGILITY),
+	LEVEL_UP_MOVE(43, MOVE_TAKEDOWN),
+	LEVEL_UP_MOVE(47, MOVE_SWORDSDANCE),
+	LEVEL_UP_MOVE(51, MOVE_HAMMERARM),
+	LEVEL_UP_MOVE(55, MOVE_EARTHQUAKE),
+	LEVEL_UP_MOVE(59, MOVE_SUPERFANG),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sFletchlingLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_TACKLE),
 	LEVEL_UP_MOVE( 1, MOVE_GROWL),
-	LEVEL_UP_MOVE( 6, MOVE_QUICKATTACK),
-	LEVEL_UP_MOVE(10, MOVE_PECK),
-	LEVEL_UP_MOVE(13, MOVE_AGILITY),
-	LEVEL_UP_MOVE(16, MOVE_FLAIL),
-	LEVEL_UP_MOVE(21, MOVE_ROOST),
-	LEVEL_UP_MOVE(25, MOVE_RAZORWIND),
-	LEVEL_UP_MOVE(29, MOVE_NATURALGIFT),
-	LEVEL_UP_MOVE(34, MOVE_FLAMECHARGE),
-	LEVEL_UP_MOVE(39, MOVE_ACROBATICS),
-	LEVEL_UP_MOVE(41, MOVE_MEFIRST),
-	LEVEL_UP_MOVE(45, MOVE_TAILWIND),
-	LEVEL_UP_MOVE(48, MOVE_STEELWING),
+	LEVEL_UP_MOVE( 4, MOVE_QUICKATTACK),
+	LEVEL_UP_MOVE( 8, MOVE_EMBER),
+	LEVEL_UP_MOVE(12, MOVE_FLAIL),
+	LEVEL_UP_MOVE(16, MOVE_ACROBATICS),
+	LEVEL_UP_MOVE(20, MOVE_AGILITY),
+	LEVEL_UP_MOVE(24, MOVE_AERIALACE),
+	LEVEL_UP_MOVE(28, MOVE_TAILWIND),
+	LEVEL_UP_MOVE(30, MOVE_NATURALGIFT),
+	LEVEL_UP_MOVE(32, MOVE_STEELWING),
+	LEVEL_UP_MOVE(34, MOVE_ROOST),
+	LEVEL_UP_MOVE(37, MOVE_MEFIRST),
+	LEVEL_UP_MOVE(40, MOVE_FLY),
 	LEVEL_UP_END
 };
 
@@ -13520,15 +13785,16 @@ static const struct LevelUpMove sFletchinderLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_TACKLE),
 	LEVEL_UP_MOVE( 1, MOVE_GROWL),
 	LEVEL_UP_MOVE( 1, MOVE_QUICKATTACK),
-	LEVEL_UP_MOVE( 6, MOVE_QUICKATTACK),
-	LEVEL_UP_MOVE(10, MOVE_PECK),
-	LEVEL_UP_MOVE(13, MOVE_AGILITY),
-	LEVEL_UP_MOVE(16, MOVE_FLAIL),
-	LEVEL_UP_MOVE(25, MOVE_ROOST),
-	LEVEL_UP_MOVE(27, MOVE_RAZORWIND),
-	LEVEL_UP_MOVE(31, MOVE_NATURALGIFT),
-	LEVEL_UP_MOVE(38, MOVE_FLAMECHARGE),
-	LEVEL_UP_MOVE(42, MOVE_ACROBATICS),
+	LEVEL_UP_MOVE( 1, MOVE_EMBER),
+	LEVEL_UP_MOVE(12, MOVE_FLAIL),
+	LEVEL_UP_MOVE(16, MOVE_ACROBATICS),
+	LEVEL_UP_MOVE(16, MOVE_FLAMECHARGE),
+	LEVEL_UP_MOVE(22, MOVE_AGILITY),
+	LEVEL_UP_MOVE(27, MOVE_AERIALACE),
+	LEVEL_UP_MOVE(32, MOVE_TAILWIND),
+	LEVEL_UP_MOVE(34, MOVE_NATURALGIFT),
+	LEVEL_UP_MOVE(37, MOVE_STEELWING),
+	LEVEL_UP_MOVE(42, MOVE_ROOST),
 	LEVEL_UP_MOVE(46, MOVE_MEFIRST),
 	LEVEL_UP_MOVE(51, MOVE_TAILWIND),
 	LEVEL_UP_MOVE(55, MOVE_STEELWING),
@@ -13542,20 +13808,21 @@ static const struct LevelUpMove sTalonflameLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_TACKLE),
 	LEVEL_UP_MOVE( 1, MOVE_GROWL),
 	LEVEL_UP_MOVE( 1, MOVE_QUICKATTACK),
-	LEVEL_UP_MOVE( 1, MOVE_PECK),
-	LEVEL_UP_MOVE( 6, MOVE_QUICKATTACK),
-	LEVEL_UP_MOVE(10, MOVE_PECK),
-	LEVEL_UP_MOVE(13, MOVE_AGILITY),
-	LEVEL_UP_MOVE(16, MOVE_FLAIL),
-	LEVEL_UP_MOVE(25, MOVE_ROOST),
-	LEVEL_UP_MOVE(27, MOVE_RAZORWIND),
-	LEVEL_UP_MOVE(31, MOVE_NATURALGIFT),
-	LEVEL_UP_MOVE(39, MOVE_FLAMECHARGE),
-	LEVEL_UP_MOVE(44, MOVE_ACROBATICS),
-	LEVEL_UP_MOVE(49, MOVE_MEFIRST),
-	LEVEL_UP_MOVE(55, MOVE_TAILWIND),
-	LEVEL_UP_MOVE(60, MOVE_STEELWING),
-	LEVEL_UP_MOVE(64, MOVE_BRAVEBIRD),
+	LEVEL_UP_MOVE( 1, MOVE_EMBER),
+	LEVEL_UP_MOVE(12, MOVE_FLAIL),
+	LEVEL_UP_MOVE(16, MOVE_ACROBATICS),
+	LEVEL_UP_MOVE(16, MOVE_FLAMECHARGE),
+	LEVEL_UP_MOVE(22, MOVE_AGILITY),
+	LEVEL_UP_MOVE(27, MOVE_AERIALACE),
+	LEVEL_UP_MOVE(32, MOVE_TAILWIND),
+	LEVEL_UP_MOVE(34, MOVE_NATURALGIFT),
+	LEVEL_UP_MOVE(34, MOVE_DUALWINGBEAT),
+	LEVEL_UP_MOVE(42, MOVE_STEELWING),
+	LEVEL_UP_MOVE(48, MOVE_ROOST),
+	LEVEL_UP_MOVE(52, MOVE_MEFIRST),
+	LEVEL_UP_MOVE(56, MOVE_FLY),
+	LEVEL_UP_MOVE(62, MOVE_FLAREBLITZ),
+	LEVEL_UP_MOVE(68, MOVE_BRAVEBIRD),
 	LEVEL_UP_END
 };
 
@@ -13576,63 +13843,67 @@ static const struct LevelUpMove sSpewpaLevelUpLearnset[] = {
 
 static const struct LevelUpMove sVivillonLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 0, MOVE_GUST),
-	LEVEL_UP_MOVE( 1, MOVE_GUST),
-	LEVEL_UP_MOVE( 1, MOVE_POWDER),
+	LEVEL_UP_MOVE( 1, MOVE_TACKLE),
+	LEVEL_UP_MOVE( 1, MOVE_STRINGSHOT),
+	LEVEL_UP_MOVE( 1, MOVE_STUNSPORE),
+	LEVEL_UP_MOVE( 1, MOVE_BUGBITE),
+	LEVEL_UP_MOVE( 1, MOVE_HARDEN),
+	LEVEL_UP_MOVE( 1, MOVE_PROTECT),
 	LEVEL_UP_MOVE( 1, MOVE_SLEEPPOWDER),
 	LEVEL_UP_MOVE( 1, MOVE_POISONPOWDER),
 	LEVEL_UP_MOVE( 1, MOVE_STUNSPORE),
-	LEVEL_UP_MOVE( 1, MOVE_STRUGGLEBUG),
-	LEVEL_UP_MOVE(12, MOVE_LIGHTSCREEN),
+	LEVEL_UP_MOVE(11, MOVE_GUST),
+	LEVEL_UP_MOVE(13, MOVE_SUPERSONIC),
 	LEVEL_UP_MOVE(17, MOVE_PSYBEAM),
-	LEVEL_UP_MOVE(21, MOVE_SUPERSONIC),
-	LEVEL_UP_MOVE(25, MOVE_DRAININGKISS),
-	LEVEL_UP_MOVE(31, MOVE_AROMATHERAPY),
-	LEVEL_UP_MOVE(35, MOVE_BUGBUZZ),
-	LEVEL_UP_MOVE(41, MOVE_SAFEGUARD),
-	LEVEL_UP_MOVE(45, MOVE_QUIVERDANCE),
-	LEVEL_UP_MOVE(50, MOVE_HURRICANE),
-	LEVEL_UP_MOVE(55, MOVE_POWDER),
+	LEVEL_UP_MOVE(21, MOVE_STRUGGLEBUG),
+	LEVEL_UP_MOVE(25, MOVE_SAFEGUARD),
+	LEVEL_UP_MOVE(29, MOVE_AROMATHERAPY),
+	LEVEL_UP_MOVE(33, MOVE_DRAININGKISS),
+	LEVEL_UP_MOVE(37, MOVE_LIGHTSCREEN),
+	LEVEL_UP_MOVE(41, MOVE_BUGBUZZ),
+	LEVEL_UP_MOVE(45, MOVE_POWDER),
+	LEVEL_UP_MOVE(49, MOVE_QUIVERDANCE),
+	LEVEL_UP_MOVE(53, MOVE_HURRICANE),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sLitleoLevelUpLearnset[] = {
-	LEVEL_UP_MOVE( 1, MOVE_TACKLE),
 	LEVEL_UP_MOVE( 1, MOVE_LEER),
-	LEVEL_UP_MOVE( 5, MOVE_EMBER),
+	LEVEL_UP_MOVE( 1, MOVE_TACKLE),
+	LEVEL_UP_MOVE( 1, MOVE_EMBER),
+	LEVEL_UP_MOVE( 4, MOVE_NOBLEROAR),
 	LEVEL_UP_MOVE( 8, MOVE_WORKUP),
-	LEVEL_UP_MOVE(11, MOVE_HEADBUTT),
-	LEVEL_UP_MOVE(15, MOVE_NOBLEROAR),
-	LEVEL_UP_MOVE(20, MOVE_TAKEDOWN),
-	LEVEL_UP_MOVE(23, MOVE_FIREFANG),
-	LEVEL_UP_MOVE(28, MOVE_ENDEAVOR),
-	LEVEL_UP_MOVE(33, MOVE_ECHOEDVOICE),
-	LEVEL_UP_MOVE(36, MOVE_FLAMETHROWER),
-	LEVEL_UP_MOVE(39, MOVE_CRUNCH),
-	LEVEL_UP_MOVE(43, MOVE_HYPERVOICE),
-	LEVEL_UP_MOVE(46, MOVE_INCINERATE),
-	LEVEL_UP_MOVE(50, MOVE_OVERHEAT),
+	LEVEL_UP_MOVE(11, MOVE_FIREFANG),
+	LEVEL_UP_MOVE(15, MOVE_TAKEDOWN),
+	LEVEL_UP_MOVE(19, MOVE_INCINERATE),
+	LEVEL_UP_MOVE(23, MOVE_ENDEAVOR),
+	LEVEL_UP_MOVE(27, MOVE_ECHOEDVOICE),
+	LEVEL_UP_MOVE(31, MOVE_CRUNCH),
+	LEVEL_UP_MOVE(35, MOVE_SUNNYDAY),
+	LEVEL_UP_MOVE(38, MOVE_FLAMETHROWER),
+	LEVEL_UP_MOVE(42, MOVE_HYPERVOICE),
+	LEVEL_UP_MOVE(46, MOVE_OVERHEAT),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sPyroarLevelUpLearnset[] = {
-	LEVEL_UP_MOVE( 1, MOVE_HYPERBEAM),
-	LEVEL_UP_MOVE( 1, MOVE_TACKLE),
 	LEVEL_UP_MOVE( 1, MOVE_LEER),
+	LEVEL_UP_MOVE( 1, MOVE_TACKLE),
 	LEVEL_UP_MOVE( 1, MOVE_EMBER),
+	LEVEL_UP_MOVE( 1, MOVE_NOBLEROAR),
 	LEVEL_UP_MOVE( 1, MOVE_WORKUP),
-	LEVEL_UP_MOVE( 5, MOVE_EMBER),
-	LEVEL_UP_MOVE( 8, MOVE_WORKUP),
-	LEVEL_UP_MOVE(11, MOVE_HEADBUTT),
-	LEVEL_UP_MOVE(15, MOVE_NOBLEROAR),
-	LEVEL_UP_MOVE(20, MOVE_TAKEDOWN),
-	LEVEL_UP_MOVE(23, MOVE_FIREFANG),
-	LEVEL_UP_MOVE(28, MOVE_ENDEAVOR),
-	LEVEL_UP_MOVE(33, MOVE_ECHOEDVOICE),
-	LEVEL_UP_MOVE(38, MOVE_FLAMETHROWER),
-	LEVEL_UP_MOVE(42, MOVE_CRUNCH),
-	LEVEL_UP_MOVE(48, MOVE_HYPERVOICE),
-	LEVEL_UP_MOVE(51, MOVE_INCINERATE),
-	LEVEL_UP_MOVE(57, MOVE_OVERHEAT),
+	LEVEL_UP_MOVE(11, MOVE_FIREFANG),
+	LEVEL_UP_MOVE(15, MOVE_TAKEDOWN),
+	LEVEL_UP_MOVE(19, MOVE_INCINERATE),
+	LEVEL_UP_MOVE(23, MOVE_ENDEAVOR),
+	LEVEL_UP_MOVE(27, MOVE_ECHOEDVOICE),
+	LEVEL_UP_MOVE(31, MOVE_CRUNCH),
+	LEVEL_UP_MOVE(35, MOVE_SUNNYDAY),
+	LEVEL_UP_MOVE(40, MOVE_FLAMETHROWER),
+	LEVEL_UP_MOVE(45, MOVE_SCORCHINGSANDS),
+	LEVEL_UP_MOVE(50, MOVE_HYPERVOICE),
+	LEVEL_UP_MOVE(55, MOVE_OVERHEAT),
+	LEVEL_UP_MOVE(60, MOVE_HYPERBEAM),
 	LEVEL_UP_END
 };
 
@@ -13717,8 +13988,6 @@ static const struct LevelUpMove sGogoatLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_GROWTH),
 	LEVEL_UP_MOVE( 1, MOVE_VINEWHIP),
 	LEVEL_UP_MOVE( 1, MOVE_TAILWHIP),
-	LEVEL_UP_MOVE( 7, MOVE_VINEWHIP),
-	LEVEL_UP_MOVE( 9, MOVE_TAILWHIP),
 	LEVEL_UP_MOVE(12, MOVE_LEECHSEED),
 	LEVEL_UP_MOVE(13, MOVE_RAZORLEAF),
 	LEVEL_UP_MOVE(16, MOVE_WORRYSEED),
@@ -13737,17 +14006,17 @@ static const struct LevelUpMove sGogoatLevelUpLearnset[] = {
 static const struct LevelUpMove sPanchamLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_TACKLE),
 	LEVEL_UP_MOVE( 1, MOVE_LEER),
-	LEVEL_UP_MOVE( 7, MOVE_ARMTHRUST),
-	LEVEL_UP_MOVE(10, MOVE_WORKUP),
-	LEVEL_UP_MOVE(12, MOVE_KARATECHOP),
-	LEVEL_UP_MOVE(15, MOVE_COMETPUNCH),
-	LEVEL_UP_MOVE(20, MOVE_SLASH),
-	LEVEL_UP_MOVE(25, MOVE_CIRCLETHROW),
-	LEVEL_UP_MOVE(27, MOVE_VITALTHROW),
-	LEVEL_UP_MOVE(33, MOVE_BODYSLAM),
-	LEVEL_UP_MOVE(39, MOVE_CRUNCH),
-	LEVEL_UP_MOVE(42, MOVE_ENTRAINMENT),
-	LEVEL_UP_MOVE(45, MOVE_PARTINGSHOT),
+	LEVEL_UP_MOVE( 4, MOVE_ARMTHRUST),
+	LEVEL_UP_MOVE( 8, MOVE_TAUNT),
+	LEVEL_UP_MOVE(12, MOVE_CIRCLETHROW),
+	LEVEL_UP_MOVE(16, MOVE_COMETPUNCH),
+	LEVEL_UP_MOVE(20, MOVE_WORKUP),
+	LEVEL_UP_MOVE(24, MOVE_SLASH),
+	LEVEL_UP_MOVE(28, MOVE_LOWSWEEP),
+	LEVEL_UP_MOVE(33, MOVE_CRUNCH),
+	LEVEL_UP_MOVE(36, MOVE_BODYSLAM),
+	LEVEL_UP_MOVE(40, MOVE_PARTINGSHOT),
+	LEVEL_UP_MOVE(44, MOVE_ENTRAINMENT),
 	LEVEL_UP_MOVE(48, MOVE_SKYUPPERCUT),
 	LEVEL_UP_END
 };
@@ -13761,22 +14030,20 @@ static const struct LevelUpMove sPangoroLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_TACKLE),
 	LEVEL_UP_MOVE( 1, MOVE_LEER),
 	LEVEL_UP_MOVE( 1, MOVE_ARMTHRUST),
-	LEVEL_UP_MOVE( 1, MOVE_WORKUP),
-	LEVEL_UP_MOVE( 7, MOVE_ARMTHRUST),
-	LEVEL_UP_MOVE(10, MOVE_WORKUP),
-	LEVEL_UP_MOVE(12, MOVE_KARATECHOP),
-	LEVEL_UP_MOVE(15, MOVE_COMETPUNCH),
-	LEVEL_UP_MOVE(20, MOVE_SLASH),
-	LEVEL_UP_MOVE(25, MOVE_CIRCLETHROW),
-	LEVEL_UP_MOVE(27, MOVE_VITALTHROW),
-	LEVEL_UP_MOVE(35, MOVE_BODYSLAM),
-	LEVEL_UP_MOVE(42, MOVE_CRUNCH),
-	LEVEL_UP_MOVE(45, MOVE_ENTRAINMENT),
-	LEVEL_UP_MOVE(48, MOVE_PARTINGSHOT),
-	LEVEL_UP_MOVE(52, MOVE_SKYUPPERCUT),
-	LEVEL_UP_MOVE(57, MOVE_LOWSWEEP),
-	LEVEL_UP_MOVE(65, MOVE_TAUNT),
-	LEVEL_UP_MOVE(70, MOVE_HAMMERARM),
+	LEVEL_UP_MOVE( 1, MOVE_TAUNT),
+	LEVEL_UP_MOVE(12, MOVE_CIRCLETHROW),
+	LEVEL_UP_MOVE(16, MOVE_COMETPUNCH),
+	LEVEL_UP_MOVE(20, MOVE_WORKUP),
+	LEVEL_UP_MOVE(24, MOVE_SLASH),
+	LEVEL_UP_MOVE(28, MOVE_LOWSWEEP),
+	LEVEL_UP_MOVE(31, MOVE_BULLETPUNCH),
+	LEVEL_UP_MOVE(35, MOVE_CRUNCH),
+	LEVEL_UP_MOVE(40, MOVE_BODYSLAM),
+	LEVEL_UP_MOVE(46, MOVE_PARTINGSHOT),
+	LEVEL_UP_MOVE(49, MOVE_SKYUPPERCUT),
+	LEVEL_UP_MOVE(52, MOVE_ENTRAINMENT),
+	LEVEL_UP_MOVE(58, MOVE_HAMMERARM),
+	LEVEL_UP_MOVE(80, MOVE_WICKEDBLOW),
 	LEVEL_UP_END
 };
 
@@ -13785,15 +14052,15 @@ static const struct LevelUpMove sFurfrouLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_GROWL),
 	LEVEL_UP_MOVE( 5, MOVE_SANDATTACK),
 	LEVEL_UP_MOVE( 9, MOVE_BABYDOLLEYES),
-	LEVEL_UP_MOVE(12, MOVE_HEADBUTT),
-	LEVEL_UP_MOVE(15, MOVE_TAILWHIP),
+	LEVEL_UP_MOVE(13, MOVE_HEADBUTT),
+	LEVEL_UP_MOVE(18, MOVE_TAILWHIP),
 	LEVEL_UP_MOVE(22, MOVE_BITE),
 	LEVEL_UP_MOVE(27, MOVE_ODORSLEUTH),
-	LEVEL_UP_MOVE(33, MOVE_RETALIATE),
-	LEVEL_UP_MOVE(35, MOVE_TAKEDOWN),
-	LEVEL_UP_MOVE(38, MOVE_CHARM),
-	LEVEL_UP_MOVE(42, MOVE_SUCKERPUNCH),
-	LEVEL_UP_MOVE(48, MOVE_COTTONGUARD),
+	LEVEL_UP_MOVE(31, MOVE_RETALIATE),
+	LEVEL_UP_MOVE(36, MOVE_SUCKERPUNCH),
+	LEVEL_UP_MOVE(41, MOVE_TAKEDOWN),
+	LEVEL_UP_MOVE(46, MOVE_CHARM),
+	LEVEL_UP_MOVE(50, MOVE_COTTONGUARD),
 	LEVEL_UP_END
 };
 
@@ -13879,17 +14146,20 @@ static const struct LevelUpMove sDoubladeLevelUpLearnset[] = {
 static const struct LevelUpMove sAegislashLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_FURYCUTTER),
 	LEVEL_UP_MOVE( 1, MOVE_PURSUIT),
-	LEVEL_UP_MOVE( 1, MOVE_AUTOTOMIZE),
+	LEVEL_UP_MOVE( 1, MOVE_HEADSMASH),
+	LEVEL_UP_MOVE( 1, MOVE_TACKLE),
+	LEVEL_UP_MOVE( 1, MOVE_FURYCUTTER),
 	LEVEL_UP_MOVE( 1, MOVE_SHADOWSNEAK),
+	LEVEL_UP_MOVE( 1, MOVE_AUTOTOMIZE),
+	LEVEL_UP_MOVE( 1, MOVE_PURSUIT),
+	LEVEL_UP_MOVE( 1, MOVE_METALSOUND),
 	LEVEL_UP_MOVE( 1, MOVE_SLASH),
 	LEVEL_UP_MOVE( 1, MOVE_IRONDEFENSE),
 	LEVEL_UP_MOVE( 1, MOVE_NIGHTSLASH),
 	LEVEL_UP_MOVE( 1, MOVE_POWERTRICK),
-	LEVEL_UP_MOVE( 1, MOVE_IRONHEAD),
-	LEVEL_UP_MOVE( 1, MOVE_HEADSMASH),
+	LEVEL_UP_MOVE( 1, MOVE_KINGSSHIELD),
 	LEVEL_UP_MOVE( 1, MOVE_SWORDSDANCE),
 	LEVEL_UP_MOVE( 1, MOVE_AERIALACE),
-	LEVEL_UP_MOVE( 1, MOVE_KINGSSHIELD),
 	LEVEL_UP_MOVE( 1, MOVE_SACREDSWORD),
 	LEVEL_UP_END
 };
@@ -14032,19 +14302,19 @@ static const struct LevelUpMove sBinacleLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_SHELLSMASH),
 	LEVEL_UP_MOVE( 1, MOVE_SCRATCH),
 	LEVEL_UP_MOVE( 1, MOVE_SANDATTACK),
-	LEVEL_UP_MOVE( 4, MOVE_WATERGUN),
-	LEVEL_UP_MOVE( 7, MOVE_WITHDRAW),
-	LEVEL_UP_MOVE(10, MOVE_FURYSWIPES),
-	LEVEL_UP_MOVE(13, MOVE_SLASH),
-	LEVEL_UP_MOVE(18, MOVE_MUDSLAP),
+	LEVEL_UP_MOVE( 4, MOVE_WITHDRAW),
+	LEVEL_UP_MOVE( 8, MOVE_WATERGUN),
+	LEVEL_UP_MOVE(12, MOVE_FURYCUTTER),
+	LEVEL_UP_MOVE(16, MOVE_FURYSWIPES),
+	LEVEL_UP_MOVE(20, MOVE_ANCIENTPOWER),
 	LEVEL_UP_MOVE(20, MOVE_CLAMP),
 	LEVEL_UP_MOVE(24, MOVE_ROCKPOLISH),
 	LEVEL_UP_MOVE(28, MOVE_ANCIENTPOWER),
 	LEVEL_UP_MOVE(32, MOVE_HONECLAWS),
-	LEVEL_UP_MOVE(37, MOVE_FURYCUTTER),
-	LEVEL_UP_MOVE(41, MOVE_NIGHTSLASH),
-	LEVEL_UP_MOVE(45, MOVE_RAZORSHELL),
-	LEVEL_UP_MOVE(49, MOVE_CROSSCHOP),
+	LEVEL_UP_MOVE(36, MOVE_RAZORSHELL),
+	LEVEL_UP_MOVE(40, MOVE_SHELLSMASH),
+	LEVEL_UP_MOVE(44, MOVE_NIGHTSLASH),
+	LEVEL_UP_MOVE(48, MOVE_CROSSCHOP),
 	LEVEL_UP_END
 };
 
@@ -14055,21 +14325,18 @@ static const struct LevelUpMove sBarbaracleLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_SCRATCH),
 	LEVEL_UP_MOVE( 1, MOVE_SANDATTACK),
 	LEVEL_UP_MOVE( 1, MOVE_WATERGUN),
-	LEVEL_UP_MOVE( 4, MOVE_WATERGUN),
-	LEVEL_UP_MOVE( 7, MOVE_WITHDRAW),
-	LEVEL_UP_MOVE(10, MOVE_FURYSWIPES),
-	LEVEL_UP_MOVE(13, MOVE_SLASH),
-	LEVEL_UP_MOVE(18, MOVE_MUDSLAP),
+	LEVEL_UP_MOVE(12, MOVE_FURYCUTTER),
+	LEVEL_UP_MOVE(16, MOVE_FURYSWIPES),
+	LEVEL_UP_MOVE(20, MOVE_ANCIENTPOWER),
 	LEVEL_UP_MOVE(20, MOVE_CLAMP),
 	LEVEL_UP_MOVE(24, MOVE_ROCKPOLISH),
 	LEVEL_UP_MOVE(28, MOVE_ANCIENTPOWER),
 	LEVEL_UP_MOVE(32, MOVE_HONECLAWS),
-	LEVEL_UP_MOVE(37, MOVE_FURYCUTTER),
-	LEVEL_UP_MOVE(44, MOVE_NIGHTSLASH),
-	LEVEL_UP_MOVE(48, MOVE_RAZORSHELL),
-	LEVEL_UP_MOVE(55, MOVE_CROSSCHOP),
-	LEVEL_UP_MOVE(60, MOVE_STONEEDGE),
-	LEVEL_UP_MOVE(65, MOVE_SKULLBASH),
+	LEVEL_UP_MOVE(36, MOVE_RAZORSHELL),
+	LEVEL_UP_MOVE(42, MOVE_SHELLSMASH),
+	LEVEL_UP_MOVE(46, MOVE_NIGHTSLASH),
+	LEVEL_UP_MOVE(50, MOVE_CROSSCHOP),
+	LEVEL_UP_MOVE(54, MOVE_STONEEDGE),
 	LEVEL_UP_END
 };
 
@@ -14378,6 +14645,8 @@ static const struct LevelUpMove sGoomyLevelUpLearnset[] = {
 };
 
 static const struct LevelUpMove sSliggooLevelUpLearnset[] = {
+	LEVEL_UP_MOVE( 0, MOVE_ACIDSPRAY),
+	LEVEL_UP_MOVE( 1, MOVE_ABSORB),
 	LEVEL_UP_MOVE( 1, MOVE_TACKLE),
 	LEVEL_UP_MOVE( 1, MOVE_BUBBLE),
 	LEVEL_UP_MOVE( 1, MOVE_ABSORB),
@@ -14395,8 +14664,8 @@ static const struct LevelUpMove sSliggooLevelUpLearnset[] = {
 
 static const struct LevelUpMove sGoodraLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 0, MOVE_AQUATAIL),
-	LEVEL_UP_MOVE( 1, MOVE_AQUATAIL),
-	LEVEL_UP_MOVE( 1, MOVE_OUTRAGE),
+	LEVEL_UP_MOVE( 1, MOVE_POISONTAIL),
+	LEVEL_UP_MOVE( 1, MOVE_TEARFULLOOK),
 	LEVEL_UP_MOVE( 1, MOVE_FEINT),
 	LEVEL_UP_MOVE( 1, MOVE_TACKLE),
 	LEVEL_UP_MOVE( 1, MOVE_BUBBLE),
@@ -14497,9 +14766,9 @@ static const struct LevelUpMove sPumpkabooLevelUpLearnset[] = {
 };
 
 static const struct LevelUpMove sGourgeistLevelUpLearnset[] = {
-	LEVEL_UP_MOVE( 1, MOVE_EXPLOSION),
-	LEVEL_UP_MOVE( 1, MOVE_PHANTOMFORCE),
-	LEVEL_UP_MOVE( 1, MOVE_TRICK),
+	LEVEL_UP_MOVE( 0, MOVE_PHANTOMFORCE),
+	LEVEL_UP_MOVE( 1, MOVE_MOONBLAST),
+	LEVEL_UP_MOVE( 1, MOVE_TRICKORTREAT),
 	LEVEL_UP_MOVE( 1, MOVE_ASTONISH),
 	LEVEL_UP_MOVE( 1, MOVE_CONFUSERAY),
 	LEVEL_UP_MOVE( 1, MOVE_SCARYFACE),
@@ -14512,12 +14781,11 @@ static const struct LevelUpMove sGourgeistLevelUpLearnset[] = {
 	LEVEL_UP_MOVE(26, MOVE_BULLETSEED),
 	LEVEL_UP_MOVE(30, MOVE_SHADOWSNEAK),
 	LEVEL_UP_MOVE(36, MOVE_SHADOWBALL),
-	LEVEL_UP_MOVE(40, MOVE_TRICKORTREAT),
-	LEVEL_UP_MOVE(42, MOVE_PAINSPLIT),
-	LEVEL_UP_MOVE(48, MOVE_SEEDBOMB),
-	LEVEL_UP_MOVE(57, MOVE_PHANTOMFORCE),
-	LEVEL_UP_MOVE(63, MOVE_TRICKORTREAT),
-	LEVEL_UP_MOVE(70, MOVE_EXPLOSION),
+	LEVEL_UP_MOVE(40, MOVE_TRICK),
+	LEVEL_UP_MOVE(44, MOVE_SPIRITSHACKLE),
+	LEVEL_UP_MOVE(48, MOVE_PAINSPLIT),
+	LEVEL_UP_MOVE(54, MOVE_POLTERGEIST),
+	LEVEL_UP_MOVE(60, MOVE_EXPLOSION),
 	LEVEL_UP_END
 };
 
@@ -14525,46 +14793,48 @@ static const struct LevelUpMove sBergmiteLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_TACKLE),
 	LEVEL_UP_MOVE( 1, MOVE_BITE),
 	LEVEL_UP_MOVE( 1, MOVE_HARDEN),
-	LEVEL_UP_MOVE( 5, MOVE_POWDERSNOW),
-	LEVEL_UP_MOVE(10, MOVE_ICYWIND),
-	LEVEL_UP_MOVE(15, MOVE_TAKEDOWN),
-	LEVEL_UP_MOVE(20, MOVE_SHARPEN),
-	LEVEL_UP_MOVE(22, MOVE_CURSE),
-	LEVEL_UP_MOVE(26, MOVE_ICEFANG),
-	LEVEL_UP_MOVE(30, MOVE_ICEBALL),
-	LEVEL_UP_MOVE(35, MOVE_RAPIDSPIN),
-	LEVEL_UP_MOVE(39, MOVE_AVALANCHE),
-	LEVEL_UP_MOVE(43, MOVE_BLIZZARD),
-	LEVEL_UP_MOVE(47, MOVE_RECOVER),
-	LEVEL_UP_MOVE(49, MOVE_DOUBLEEDGE),
+	LEVEL_UP_MOVE( 3, MOVE_TACKLE),
+	LEVEL_UP_MOVE( 6, MOVE_POWDERSNOW),
+	LEVEL_UP_MOVE( 9, MOVE_SHARPEN),
+	LEVEL_UP_MOVE(12, MOVE_ICYWIND),
+	LEVEL_UP_MOVE(16, MOVE_PROTECT),
+	LEVEL_UP_MOVE(19, MOVE_ICEFANG),
+	LEVEL_UP_MOVE(23, MOVE_BITE),
+	LEVEL_UP_MOVE(27, MOVE_ICEBALL),
+	LEVEL_UP_MOVE(31, MOVE_TAKEDOWN),
+	LEVEL_UP_MOVE(35, MOVE_BLIZZARD),
+	LEVEL_UP_MOVE(39, MOVE_IRONDEFENSE),
+	LEVEL_UP_MOVE(42, MOVE_DOUBLEEDGE),
+	LEVEL_UP_MOVE(46, MOVE_CRUNCH),
+	LEVEL_UP_MOVE(50, MOVE_AVALANCHE),
+	LEVEL_UP_MOVE(54, MOVE_CURSE),
+	LEVEL_UP_MOVE(57, MOVE_RECOVER),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sAvaluggLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 0, MOVE_BODYSLAM),
-	LEVEL_UP_MOVE( 1, MOVE_BODYSLAM),
 	LEVEL_UP_MOVE( 1, MOVE_WIDEGUARD),
-	LEVEL_UP_MOVE( 1, MOVE_CRUNCH),
 	LEVEL_UP_MOVE( 1, MOVE_SKULLBASH),
-	LEVEL_UP_MOVE( 1, MOVE_IRONDEFENSE),
-	LEVEL_UP_MOVE( 1, MOVE_TACKLE),
-	LEVEL_UP_MOVE( 1, MOVE_BITE),
+	LEVEL_UP_MOVE( 1, MOVE_RAPIDSPIN),
 	LEVEL_UP_MOVE( 1, MOVE_HARDEN),
-	LEVEL_UP_MOVE( 1, MOVE_POWDERSNOW),
-	LEVEL_UP_MOVE( 5, MOVE_POWDERSNOW),
-	LEVEL_UP_MOVE(10, MOVE_ICYWIND),
-	LEVEL_UP_MOVE(15, MOVE_TAKEDOWN),
-	LEVEL_UP_MOVE(20, MOVE_SHARPEN),
-	LEVEL_UP_MOVE(22, MOVE_CURSE),
-	LEVEL_UP_MOVE(26, MOVE_ICEFANG),
-	LEVEL_UP_MOVE(30, MOVE_ICEBALL),
-	LEVEL_UP_MOVE(35, MOVE_RAPIDSPIN),
-	LEVEL_UP_MOVE(42, MOVE_AVALANCHE),
-	LEVEL_UP_MOVE(46, MOVE_BLIZZARD),
-	LEVEL_UP_MOVE(51, MOVE_RECOVER),
-	LEVEL_UP_MOVE(56, MOVE_DOUBLEEDGE),
-	LEVEL_UP_MOVE(60, MOVE_SKULLBASH),
-	LEVEL_UP_MOVE(65, MOVE_CRUNCH),
+	LEVEL_UP_MOVE( 3, MOVE_TACKLE),
+	LEVEL_UP_MOVE( 6, MOVE_POWDERSNOW),
+	LEVEL_UP_MOVE( 9, MOVE_SHARPEN),
+	LEVEL_UP_MOVE(12, MOVE_ICYWIND),
+	LEVEL_UP_MOVE(16, MOVE_PROTECT),
+	LEVEL_UP_MOVE(19, MOVE_ICEFANG),
+	LEVEL_UP_MOVE(23, MOVE_BITE),
+	LEVEL_UP_MOVE(27, MOVE_ICEBALL),
+	LEVEL_UP_MOVE(31, MOVE_TAKEDOWN),
+	LEVEL_UP_MOVE(35, MOVE_BLIZZARD),
+	LEVEL_UP_MOVE(36, MOVE_BODYSLAM),
+	LEVEL_UP_MOVE(41, MOVE_IRONDEFENSE),
+	LEVEL_UP_MOVE(45, MOVE_DOUBLEEDGE),
+	LEVEL_UP_MOVE(50, MOVE_CRUNCH),
+	LEVEL_UP_MOVE(55, MOVE_AVALANCHE),
+	LEVEL_UP_MOVE(60, MOVE_CURSE),
+	LEVEL_UP_MOVE(64, MOVE_RECOVER),
 	LEVEL_UP_END
 };
 
@@ -14589,9 +14859,8 @@ static const struct LevelUpMove sNoibatLevelUpLearnset[] = {
 };
 
 static const struct LevelUpMove sNoivernLevelUpLearnset[] = {
-	LEVEL_UP_MOVE( 1, MOVE_BOOMBURST),
-	LEVEL_UP_MOVE( 1, MOVE_DRAGONPULSE),
-	LEVEL_UP_MOVE( 1, MOVE_HURRICANE),
+	LEVEL_UP_MOVE( 0, MOVE_DRAGONPULSE),
+	LEVEL_UP_MOVE( 1, MOVE_AEROBLAST),
 	LEVEL_UP_MOVE( 1, MOVE_MOONLIGHT),
 	LEVEL_UP_MOVE( 1, MOVE_SCREECH),
 	LEVEL_UP_MOVE( 1, MOVE_SUPERSONIC),
@@ -14660,22 +14929,24 @@ static const struct LevelUpMove sYveltalLevelUpLearnset[] = {
 };
 
 static const struct LevelUpMove sZygardeLevelUpLearnset[] = {
-	LEVEL_UP_MOVE( 1, MOVE_GLARE),
+	LEVEL_UP_MOVE( 1, MOVE_SANDSTORM),
+	LEVEL_UP_MOVE( 1, MOVE_BIND),
+	LEVEL_UP_MOVE( 1, MOVE_DRAGONBREATH),
 	LEVEL_UP_MOVE( 1, MOVE_BULLDOZE),
 	LEVEL_UP_MOVE( 1, MOVE_DRAGONBREATH),
 	LEVEL_UP_MOVE( 1, MOVE_BITE),
-	LEVEL_UP_MOVE( 5, MOVE_SAFEGUARD),
-	LEVEL_UP_MOVE(10, MOVE_DIG),
-	LEVEL_UP_MOVE(18, MOVE_BIND),
-	LEVEL_UP_MOVE(26, MOVE_LANDSWRATH),
-	LEVEL_UP_MOVE(35, MOVE_SANDSTORM),
-	LEVEL_UP_MOVE(44, MOVE_HAZE),
-	LEVEL_UP_MOVE(51, MOVE_CRUNCH),
-	LEVEL_UP_MOVE(55, MOVE_EARTHQUAKE),
-	LEVEL_UP_MOVE(59, MOVE_CAMOUFLAGE),
-	LEVEL_UP_MOVE(63, MOVE_DRAGONPULSE),
-	LEVEL_UP_MOVE(72, MOVE_COIL),
-	LEVEL_UP_MOVE(80, MOVE_OUTRAGE),
+	LEVEL_UP_MOVE( 8, MOVE_HAZE),
+	LEVEL_UP_MOVE(16, MOVE_SAFEGUARD),
+	LEVEL_UP_MOVE(24, MOVE_DIG),
+	LEVEL_UP_MOVE(32, MOVE_CRUNCH),
+	LEVEL_UP_MOVE(40, MOVE_CAMOUFLAGE),
+	LEVEL_UP_MOVE(48, MOVE_BREAKINGSWIPE),
+	LEVEL_UP_MOVE(54, MOVE_LANDSWRATH),
+	LEVEL_UP_MOVE(60, MOVE_GLARE),
+	LEVEL_UP_MOVE(68, MOVE_DRAGONPULSE),
+	LEVEL_UP_MOVE(76, MOVE_COIL),
+	LEVEL_UP_MOVE(84, MOVE_EARTHQUAKE),
+	LEVEL_UP_MOVE(92, MOVE_OUTRAGE),
 	LEVEL_UP_END
 };
 
@@ -14746,22 +15017,25 @@ static const struct LevelUpMove sHoopaUnboundLevelUpLearnset[] = {
 };
 
 static const struct LevelUpMove sVolcanionLevelUpLearnset[] = {
-	LEVEL_UP_MOVE( 1, MOVE_STEAMERUPTION),
-	LEVEL_UP_MOVE( 1, MOVE_FLAREBLITZ),
-	LEVEL_UP_MOVE( 1, MOVE_TAKEDOWN),
-	LEVEL_UP_MOVE( 8, MOVE_MIST),
-	LEVEL_UP_MOVE(11, MOVE_HAZE),
-	LEVEL_UP_MOVE(15, MOVE_FLAMECHARGE),
-	LEVEL_UP_MOVE(21, MOVE_WATERPULSE),
-	LEVEL_UP_MOVE(28, MOVE_STOMP),
-	LEVEL_UP_MOVE(32, MOVE_SCALD),
-	LEVEL_UP_MOVE(40, MOVE_WEATHERBALL),
-	LEVEL_UP_MOVE(46, MOVE_BODYSLAM),
-	LEVEL_UP_MOVE(50, MOVE_HYDROPUMP),
-	LEVEL_UP_MOVE(58, MOVE_FLAREBLITZ),
-	LEVEL_UP_MOVE(65, MOVE_OVERHEAT),
-	LEVEL_UP_MOVE(76, MOVE_EXPLOSION),
-	LEVEL_UP_MOVE(85, MOVE_STEAMERUPTION),
+	LEVEL_UP_MOVE( 1, MOVE_FIRESPIN),
+	LEVEL_UP_MOVE( 1, MOVE_WATERGUN),
+	LEVEL_UP_MOVE( 6, MOVE_LEER),
+	LEVEL_UP_MOVE(12, MOVE_WEATHERBALL),
+	LEVEL_UP_MOVE(18, MOVE_FLAMECHARGE),
+	LEVEL_UP_MOVE(24, MOVE_WATERPULSE),
+	LEVEL_UP_MOVE(30, MOVE_SCARYFACE),
+	LEVEL_UP_MOVE(36, MOVE_INCINERATE),
+	LEVEL_UP_MOVE(42, MOVE_STOMP),
+	LEVEL_UP_MOVE(48, MOVE_SCALD),
+	LEVEL_UP_MOVE(54, MOVE_TAKEDOWN),
+	LEVEL_UP_MOVE(60, MOVE_MIST),
+	LEVEL_UP_MOVE(60, MOVE_HAZE),
+	LEVEL_UP_MOVE(66, MOVE_STRANGESTEAM),
+	LEVEL_UP_MOVE(72, MOVE_HYDROPUMP),
+	LEVEL_UP_MOVE(78, MOVE_FLAREBLITZ),
+	LEVEL_UP_MOVE(84, MOVE_STEAMERUPTION),
+	LEVEL_UP_MOVE(90, MOVE_OVERHEAT),
+	LEVEL_UP_MOVE(96, MOVE_EXPLOSION),
 	LEVEL_UP_END
 };
 
@@ -14856,7 +15130,6 @@ static const struct LevelUpMove sDartrixLevelUpLearnset[] = {
 
 static const struct LevelUpMove sDecidueyeLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 0, MOVE_SPIRITSHACKLE),
-	LEVEL_UP_MOVE( 1, MOVE_SPIRITSHACKLE),
 	LEVEL_UP_MOVE( 1, MOVE_PHANTOMFORCE),
 	LEVEL_UP_MOVE( 1, MOVE_LEAFSTORM),
 	LEVEL_UP_MOVE( 1, MOVE_UTURN),
@@ -14910,23 +15183,22 @@ static const struct LevelUpMove sTorracatLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 4, MOVE_GROWL),
 	LEVEL_UP_MOVE( 8, MOVE_LICK),
 	LEVEL_UP_MOVE(11, MOVE_LEER),
-	LEVEL_UP_MOVE(14, MOVE_FIREFANG),
-	LEVEL_UP_MOVE(16, MOVE_DOUBLEKICK),
-	LEVEL_UP_MOVE(19, MOVE_ROAR),
-	LEVEL_UP_MOVE(24, MOVE_BITE),
-	LEVEL_UP_MOVE(28, MOVE_SWAGGER),
-	LEVEL_UP_MOVE(33, MOVE_FURYSWIPES),
-	LEVEL_UP_MOVE(37, MOVE_THRASH),
-	LEVEL_UP_MOVE(42, MOVE_FLAMETHROWER),
-	LEVEL_UP_MOVE(46, MOVE_SCARYFACE),
-	LEVEL_UP_MOVE(51, MOVE_FLAREBLITZ),
+	LEVEL_UP_MOVE(12, MOVE_FURYSWIPES),
+	LEVEL_UP_MOVE(15, MOVE_BITE),
+	LEVEL_UP_MOVE(20, MOVE_DOUBLEKICK),
+	LEVEL_UP_MOVE(25, MOVE_FIREFANG),
+	LEVEL_UP_MOVE(30, MOVE_SCARYFACE),
+	LEVEL_UP_MOVE(32, MOVE_SWAGGER),
+	LEVEL_UP_MOVE(40, MOVE_FLAMETHROWER),
+	LEVEL_UP_MOVE(45, MOVE_THRASH),
+	LEVEL_UP_MOVE(50, MOVE_FLAREBLITZ),
 	LEVEL_UP_MOVE(55, MOVE_OUTRAGE),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sIncineroarLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 0, MOVE_DARKESTLARIAT),
-	LEVEL_UP_MOVE( 1, MOVE_DARKESTLARIAT),
+	LEVEL_UP_MOVE( 1, MOVE_THROATCHOP),
 	LEVEL_UP_MOVE( 1, MOVE_BULKUP),
 	LEVEL_UP_MOVE( 1, MOVE_THROATCHOP),
 	LEVEL_UP_MOVE( 1, MOVE_SCRATCH),
@@ -14936,18 +15208,19 @@ static const struct LevelUpMove sIncineroarLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 4, MOVE_GROWL),
 	LEVEL_UP_MOVE( 8, MOVE_LICK),
 	LEVEL_UP_MOVE(11, MOVE_LEER),
-	LEVEL_UP_MOVE(14, MOVE_FIREFANG),
-	LEVEL_UP_MOVE(16, MOVE_DOUBLEKICK),
-	LEVEL_UP_MOVE(19, MOVE_ROAR),
-	LEVEL_UP_MOVE(24, MOVE_BITE),
-	LEVEL_UP_MOVE(28, MOVE_SWAGGER),
-	LEVEL_UP_MOVE(33, MOVE_FURYSWIPES),
-	LEVEL_UP_MOVE(38, MOVE_THRASH),
-	LEVEL_UP_MOVE(44, MOVE_FLAMETHROWER),
-	LEVEL_UP_MOVE(49, MOVE_SCARYFACE),
+	LEVEL_UP_MOVE(12, MOVE_FURYSWIPES),
+	LEVEL_UP_MOVE(15, MOVE_BITE),
+	LEVEL_UP_MOVE(20, MOVE_DOUBLEKICK),
+	LEVEL_UP_MOVE(25, MOVE_FIREFANG),
+	LEVEL_UP_MOVE(30, MOVE_SCARYFACE),
+	LEVEL_UP_MOVE(32, MOVE_SWAGGER),
+	LEVEL_UP_MOVE(33, MOVE_DARKESTLARIAT),
+	LEVEL_UP_MOVE(37, MOVE_FIREPUNCH),
+	LEVEL_UP_MOVE(43, MOVE_FLAMETHROWER),
+	LEVEL_UP_MOVE(49, MOVE_THRASH),
 	LEVEL_UP_MOVE(55, MOVE_FLAREBLITZ),
-	LEVEL_UP_MOVE(60, MOVE_OUTRAGE),
-	LEVEL_UP_MOVE(66, MOVE_CROSSCHOP),
+	LEVEL_UP_MOVE(61, MOVE_OUTRAGE),
+	LEVEL_UP_MOVE(67, MOVE_CROSSCHOP),
 	LEVEL_UP_END
 };
 
@@ -14966,8 +15239,7 @@ static const struct LevelUpMove sPopplioLevelUpLearnset[] = {
 	LEVEL_UP_MOVE(32, MOVE_HYPERVOICE),
 	LEVEL_UP_MOVE(36, MOVE_MOONBLAST),
 	LEVEL_UP_MOVE(39, MOVE_CAPTIVATE),
-	LEVEL_UP_MOVE(43, MOVE_HYDROPUMP),
-	LEVEL_UP_MOVE(46, MOVE_MISTYTERRAIN),
+	LEVEL_UP_MOVE(42, MOVE_RELICSONG),
 	LEVEL_UP_END
 };
 
@@ -14985,17 +15257,17 @@ static const struct LevelUpMove sBrionneLevelUpLearnset[] = {
 	LEVEL_UP_MOVE(24, MOVE_BUBBLEBEAM),
 	LEVEL_UP_MOVE(28, MOVE_SING),
 	LEVEL_UP_MOVE(33, MOVE_DOUBLESLAP),
-	LEVEL_UP_MOVE(37, MOVE_HYPERVOICE),
-	LEVEL_UP_MOVE(42, MOVE_MOONBLAST),
-	LEVEL_UP_MOVE(46, MOVE_CAPTIVATE),
-	LEVEL_UP_MOVE(51, MOVE_HYDROPUMP),
-	LEVEL_UP_MOVE(55, MOVE_MISTYTERRAIN),
+	LEVEL_UP_MOVE(35, MOVE_MISTYTERRAIN),
+	LEVEL_UP_MOVE(40, MOVE_HYPERVOICE),
+	LEVEL_UP_MOVE(45, MOVE_MOONBLAST),
+	LEVEL_UP_MOVE(50, MOVE_HYDROPUMP),
+	LEVEL_UP_MOVE(55, MOVE_CAPTIVATE),
+	LEVEL_UP_MOVE(60, MOVE_RELICSONG),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sPrimarinaLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 0, MOVE_SPARKLINGARIA),
-	LEVEL_UP_MOVE( 1, MOVE_SPARKLINGARIA),
 	LEVEL_UP_MOVE( 1, MOVE_POUND),
 	LEVEL_UP_MOVE( 1, MOVE_WATERGUN),
 	LEVEL_UP_MOVE( 1, MOVE_GROWL),
@@ -15009,11 +15281,13 @@ static const struct LevelUpMove sPrimarinaLevelUpLearnset[] = {
 	LEVEL_UP_MOVE(24, MOVE_BUBBLEBEAM),
 	LEVEL_UP_MOVE(28, MOVE_SING),
 	LEVEL_UP_MOVE(33, MOVE_DOUBLESLAP),
-	LEVEL_UP_MOVE(38, MOVE_HYPERVOICE),
-	LEVEL_UP_MOVE(44, MOVE_MOONBLAST),
-	LEVEL_UP_MOVE(49, MOVE_CAPTIVATE),
-	LEVEL_UP_MOVE(55, MOVE_HYDROPUMP),
-	LEVEL_UP_MOVE(60, MOVE_MISTYTERRAIN),
+	LEVEL_UP_MOVE(33, MOVE_SPARKLINGARIA),
+	LEVEL_UP_MOVE(37, MOVE_MISTYTERRAIN),
+	LEVEL_UP_MOVE(44, MOVE_HYPERVOICE),
+	LEVEL_UP_MOVE(51, MOVE_MOONBLAST),
+	LEVEL_UP_MOVE(58, MOVE_HYDROPUMP),
+	LEVEL_UP_MOVE(65, MOVE_CAPTIVATE),
+	LEVEL_UP_MOVE(72, MOVE_RELICSONG),
 	LEVEL_UP_END
 };
 
@@ -15274,21 +15548,23 @@ static const struct LevelUpMove sRibombeeLevelUpLearnset[] = {
 };
 
 static const struct LevelUpMove sRockruffLevelUpLearnset[] = {
-	LEVEL_UP_MOVE( 1, MOVE_TACKLE),
+	LEVEL_UP_MOVE( 1, MOVE_ODORSLEUTH),
 	LEVEL_UP_MOVE( 1, MOVE_LEER),
+	LEVEL_UP_MOVE( 1, MOVE_TACKLE),
 	LEVEL_UP_MOVE( 4, MOVE_SANDATTACK),
-	LEVEL_UP_MOVE( 7, MOVE_BITE),
-	LEVEL_UP_MOVE(12, MOVE_HOWL),
-	LEVEL_UP_MOVE(15, MOVE_ROCKTHROW),
-	LEVEL_UP_MOVE(18, MOVE_ODORSLEUTH),
+	LEVEL_UP_MOVE( 8, MOVE_DOUBLETEAM),
+	LEVEL_UP_MOVE(12, MOVE_ROCKTHROW),
+	LEVEL_UP_MOVE(16, MOVE_HOWL),
+	LEVEL_UP_MOVE(19, MOVE_BITE),
 	LEVEL_UP_MOVE(23, MOVE_ROCKTOMB),
-	LEVEL_UP_MOVE(26, MOVE_ROAR),
-	LEVEL_UP_MOVE(29, MOVE_STEALTHROCK),
+	LEVEL_UP_MOVE(27, MOVE_ROAR),
+	LEVEL_UP_MOVE(30, MOVE_CRUNCH),
 	LEVEL_UP_MOVE(34, MOVE_ROCKSLIDE),
-	LEVEL_UP_MOVE(37, MOVE_SCARYFACE),
-	LEVEL_UP_MOVE(40, MOVE_CRUNCH),
-	LEVEL_UP_MOVE(45, MOVE_ROCKCLIMB),
-	LEVEL_UP_MOVE(48, MOVE_STONEEDGE),
+	LEVEL_UP_MOVE(38, MOVE_SCARYFACE),
+	LEVEL_UP_MOVE(41, MOVE_ROCKCLIMB),
+	LEVEL_UP_MOVE(45, MOVE_STEALTHROCK),
+	LEVEL_UP_MOVE(49, MOVE_PLAYROUGH),
+	LEVEL_UP_MOVE(53, MOVE_STONEEDGE),
 	LEVEL_UP_END
 };
 
@@ -15297,23 +15573,25 @@ static const struct LevelUpMove sLycanrocLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_ACCELEROCK),
 	LEVEL_UP_MOVE( 1, MOVE_QUICKGUARD),
 	LEVEL_UP_MOVE( 1, MOVE_QUICKATTACK),
-	LEVEL_UP_MOVE( 1, MOVE_TACKLE),
+	LEVEL_UP_MOVE( 1, MOVE_ODORSLEUTH),
 	LEVEL_UP_MOVE( 1, MOVE_LEER),
+	LEVEL_UP_MOVE( 1, MOVE_TACKLE),
 	LEVEL_UP_MOVE( 1, MOVE_SANDATTACK),
-	LEVEL_UP_MOVE( 1, MOVE_BITE),
-	LEVEL_UP_MOVE( 4, MOVE_SANDATTACK),
-	LEVEL_UP_MOVE( 7, MOVE_BITE),
-	LEVEL_UP_MOVE(12, MOVE_HOWL),
-	LEVEL_UP_MOVE(15, MOVE_ROCKTHROW),
-	LEVEL_UP_MOVE(18, MOVE_ODORSLEUTH),
+	LEVEL_UP_MOVE( 1, MOVE_DOUBLETEAM),
+	LEVEL_UP_MOVE(12, MOVE_ROCKTHROW),
+	LEVEL_UP_MOVE(16, MOVE_HOWL),
+	LEVEL_UP_MOVE(19, MOVE_BITE),
 	LEVEL_UP_MOVE(23, MOVE_ROCKTOMB),
-	LEVEL_UP_MOVE(26, MOVE_ROAR),
-	LEVEL_UP_MOVE(29, MOVE_STEALTHROCK),
-	LEVEL_UP_MOVE(34, MOVE_ROCKSLIDE),
-	LEVEL_UP_MOVE(37, MOVE_SCARYFACE),
-	LEVEL_UP_MOVE(40, MOVE_CRUNCH),
-	LEVEL_UP_MOVE(45, MOVE_ROCKCLIMB),
-	LEVEL_UP_MOVE(48, MOVE_STONEEDGE),
+	LEVEL_UP_MOVE(24, MOVE_ACCELEROCK),
+	LEVEL_UP_MOVE(29, MOVE_ROAR),
+	LEVEL_UP_MOVE(33, MOVE_CRUNCH),
+	LEVEL_UP_MOVE(38, MOVE_ROCKSLIDE),
+	LEVEL_UP_MOVE(43, MOVE_SCARYFACE),
+	LEVEL_UP_MOVE(47, MOVE_ROCKCLIMB),
+	LEVEL_UP_MOVE(52, MOVE_STEALTHROCK),
+	LEVEL_UP_MOVE(56, MOVE_PLAYROUGH),
+	LEVEL_UP_MOVE(61, MOVE_STONEEDGE),
+	LEVEL_UP_MOVE(66, MOVE_CLOSECOMBAT),
 	LEVEL_UP_END
 };
 
@@ -15908,19 +16186,19 @@ static const struct LevelUpMove sKomalaLevelUpLearnset[] = {
 static const struct LevelUpMove sTurtonatorLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_EMBER),
 	LEVEL_UP_MOVE( 1, MOVE_TACKLE),
-	LEVEL_UP_MOVE( 5, MOVE_SMOG),
-	LEVEL_UP_MOVE( 9, MOVE_PROTECT),
-	LEVEL_UP_MOVE(13, MOVE_INCINERATE),
-	LEVEL_UP_MOVE(17, MOVE_FLAIL),
-	LEVEL_UP_MOVE(21, MOVE_ENDURE),
-	LEVEL_UP_MOVE(25, MOVE_IRONDEFENSE),
-	LEVEL_UP_MOVE(29, MOVE_FLAMETHROWER),
-	LEVEL_UP_MOVE(33, MOVE_BODYSLAM),
-	LEVEL_UP_MOVE(37, MOVE_SHELLSMASH),
-	LEVEL_UP_MOVE(41, MOVE_DRAGONPULSE),
-	LEVEL_UP_MOVE(45, MOVE_SHELLTRAP),
-	LEVEL_UP_MOVE(49, MOVE_OVERHEAT),
-	LEVEL_UP_MOVE(53, MOVE_EXPLOSION),
+	LEVEL_UP_MOVE( 4, MOVE_EMBER),
+	LEVEL_UP_MOVE( 8, MOVE_PROTECT),
+	LEVEL_UP_MOVE(12, MOVE_ENDURE),
+	LEVEL_UP_MOVE(16, MOVE_FLAIL),
+	LEVEL_UP_MOVE(20, MOVE_INCINERATE),
+	LEVEL_UP_MOVE(24, MOVE_IRONDEFENSE),
+	LEVEL_UP_MOVE(28, MOVE_DRAGONPULSE),
+	LEVEL_UP_MOVE(32, MOVE_BODYSLAM),
+	LEVEL_UP_MOVE(36, MOVE_FLAMETHROWER),
+	LEVEL_UP_MOVE(40, MOVE_SHELLTRAP),
+	LEVEL_UP_MOVE(44, MOVE_SHELLSMASH),
+	LEVEL_UP_MOVE(48, MOVE_SEARINGSHOT),
+	LEVEL_UP_MOVE(52, MOVE_EXPLOSION),
 	LEVEL_UP_END
 };
 
@@ -15989,12 +16267,13 @@ static const struct LevelUpMove sDrampaLevelUpLearnset[] = {
 	LEVEL_UP_MOVE(21, MOVE_DRAGONRAGE),
 	LEVEL_UP_MOVE(25, MOVE_NATURALGIFT),
 	LEVEL_UP_MOVE(29, MOVE_DRAGONBREATH),
-	LEVEL_UP_MOVE(33, MOVE_SAFEGUARD),
-	LEVEL_UP_MOVE(37, MOVE_EXTRASENSORY),
-	LEVEL_UP_MOVE(41, MOVE_DRAGONPULSE),
-	LEVEL_UP_MOVE(45, MOVE_FLY),
-	LEVEL_UP_MOVE(49, MOVE_HYPERVOICE),
-	LEVEL_UP_MOVE(53, MOVE_OUTRAGE),
+	LEVEL_UP_MOVE(33, MOVE_EXTRASENSORY),
+	LEVEL_UP_MOVE(38, MOVE_DRAGONPULSE),
+	LEVEL_UP_MOVE(43, MOVE_LIGHTSCREEN),
+	LEVEL_UP_MOVE(48, MOVE_FLY),
+	LEVEL_UP_MOVE(53, MOVE_HYPERVOICE),
+	LEVEL_UP_MOVE(58, MOVE_OUTRAGE),
+	LEVEL_UP_MOVE(63, MOVE_DRAGONENERGY),
 	LEVEL_UP_END
 };
 
@@ -16022,19 +16301,19 @@ static const struct LevelUpMove sDhelmiseLevelUpLearnset[] = {
 
 static const struct LevelUpMove sJangmoOLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_TACKLE),
-	LEVEL_UP_MOVE( 5, MOVE_LEER),
-	LEVEL_UP_MOVE( 9, MOVE_BIDE),
-	LEVEL_UP_MOVE(13, MOVE_PROTECT),
-	LEVEL_UP_MOVE(17, MOVE_DRAGONTAIL),
-	LEVEL_UP_MOVE(21, MOVE_SCARYFACE),
-	LEVEL_UP_MOVE(25, MOVE_HEADBUTT),
-	LEVEL_UP_MOVE(29, MOVE_WORKUP),
-	LEVEL_UP_MOVE(33, MOVE_SCREECH),
-	LEVEL_UP_MOVE(37, MOVE_IRONDEFENSE),
-	LEVEL_UP_MOVE(41, MOVE_DRAGONCLAW),
-	LEVEL_UP_MOVE(45, MOVE_NOBLEROAR),
-	LEVEL_UP_MOVE(49, MOVE_DRAGONDANCE),
-	LEVEL_UP_MOVE(53, MOVE_OUTRAGE),
+	LEVEL_UP_MOVE( 1, MOVE_LEER),
+	LEVEL_UP_MOVE( 4, MOVE_PROTECT),
+	LEVEL_UP_MOVE( 8, MOVE_DRAGONTAIL),
+	LEVEL_UP_MOVE(12, MOVE_SCARYFACE),	
+	LEVEL_UP_MOVE(16, MOVE_HEADBUTT),
+	LEVEL_UP_MOVE(20, MOVE_WORKUP),
+	LEVEL_UP_MOVE(24, MOVE_SCREECH),
+	LEVEL_UP_MOVE(28, MOVE_IRONDEFENSE),
+	LEVEL_UP_MOVE(32, MOVE_DRAGONCLAW),
+	LEVEL_UP_MOVE(36, MOVE_NOBLEROAR),
+	LEVEL_UP_MOVE(40, MOVE_DRAGONDANCE),
+	LEVEL_UP_MOVE(44, MOVE_OUTRAGE),
+	LEVEL_UP_MOVE(48, MOVE_CLANGINGSCALES),
 	LEVEL_UP_END
 };
 
@@ -16046,26 +16325,23 @@ static const struct LevelUpMove sHakamoOLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_LEER),
 	LEVEL_UP_MOVE( 1, MOVE_BIDE),
 	LEVEL_UP_MOVE( 1, MOVE_PROTECT),
-	LEVEL_UP_MOVE( 5, MOVE_LEER),
-	LEVEL_UP_MOVE( 9, MOVE_BIDE),
-	LEVEL_UP_MOVE(13, MOVE_PROTECT),
-	LEVEL_UP_MOVE(17, MOVE_DRAGONTAIL),
-	LEVEL_UP_MOVE(21, MOVE_SCARYFACE),
-	LEVEL_UP_MOVE(25, MOVE_HEADBUTT),
-	LEVEL_UP_MOVE(29, MOVE_WORKUP),
-	LEVEL_UP_MOVE(33, MOVE_SCREECH),
-	LEVEL_UP_MOVE(38, MOVE_IRONDEFENSE),
-	LEVEL_UP_MOVE(43, MOVE_DRAGONCLAW),
-	LEVEL_UP_MOVE(48, MOVE_NOBLEROAR),
-	LEVEL_UP_MOVE(53, MOVE_DRAGONDANCE),
-	LEVEL_UP_MOVE(58, MOVE_OUTRAGE),
-	LEVEL_UP_MOVE(63, MOVE_CLOSECOMBAT),
+	LEVEL_UP_MOVE( 1, MOVE_DRAGONTAIL),
+	LEVEL_UP_MOVE(12, MOVE_SCARYFACE),
+	LEVEL_UP_MOVE(16, MOVE_HEADBUTT),
+	LEVEL_UP_MOVE(20, MOVE_WORKUP),
+	LEVEL_UP_MOVE(24, MOVE_SCREECH),
+	LEVEL_UP_MOVE(28, MOVE_IRONDEFENSE),
+	LEVEL_UP_MOVE(32, MOVE_DRAGONCLAW),
+	LEVEL_UP_MOVE(34, MOVE_SKYUPPERCUT),
+	LEVEL_UP_MOVE(38, MOVE_NOBLEROAR),
+	LEVEL_UP_MOVE(44, MOVE_DRAGONDANCE),
+	LEVEL_UP_MOVE(50, MOVE_OUTRAGE),
+	LEVEL_UP_MOVE(56, MOVE_CLOSECOMBAT),
+	LEVEL_UP_MOVE(62, MOVE_CLANGINGSCALES),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sKommoOLevelUpLearnset[] = {
-	LEVEL_UP_MOVE( 0, MOVE_CLANGINGSCALES),
-	LEVEL_UP_MOVE( 1, MOVE_CLANGINGSCALES),
 	LEVEL_UP_MOVE( 1, MOVE_SKYUPPERCUT),
 	LEVEL_UP_MOVE( 1, MOVE_BELLYDRUM),
 	LEVEL_UP_MOVE( 1, MOVE_AUTOTOMIZE),
@@ -16073,20 +16349,21 @@ static const struct LevelUpMove sKommoOLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_LEER),
 	LEVEL_UP_MOVE( 1, MOVE_BIDE),
 	LEVEL_UP_MOVE( 1, MOVE_PROTECT),
-	LEVEL_UP_MOVE( 5, MOVE_LEER),
-	LEVEL_UP_MOVE( 9, MOVE_BIDE),
-	LEVEL_UP_MOVE(13, MOVE_PROTECT),
-	LEVEL_UP_MOVE(17, MOVE_DRAGONTAIL),
-	LEVEL_UP_MOVE(21, MOVE_SCARYFACE),
-	LEVEL_UP_MOVE(25, MOVE_HEADBUTT),
-	LEVEL_UP_MOVE(29, MOVE_WORKUP),
-	LEVEL_UP_MOVE(33, MOVE_SCREECH),
-	LEVEL_UP_MOVE(38, MOVE_IRONDEFENSE),
-	LEVEL_UP_MOVE(43, MOVE_DRAGONCLAW),
-	LEVEL_UP_MOVE(51, MOVE_NOBLEROAR),
-	LEVEL_UP_MOVE(59, MOVE_DRAGONDANCE),
-	LEVEL_UP_MOVE(67, MOVE_OUTRAGE),
-	LEVEL_UP_MOVE(75, MOVE_CLOSECOMBAT),
+	LEVEL_UP_MOVE( 1, MOVE_DRAGONTAIL),
+	LEVEL_UP_MOVE(12, MOVE_SCARYFACE),
+	LEVEL_UP_MOVE(16, MOVE_HEADBUTT),
+	LEVEL_UP_MOVE(20, MOVE_WORKUP),
+	LEVEL_UP_MOVE(24, MOVE_SCREECH),
+	LEVEL_UP_MOVE(28, MOVE_IRONDEFENSE),
+	LEVEL_UP_MOVE(32, MOVE_DRAGONCLAW),
+	LEVEL_UP_MOVE(34, MOVE_SKYUPPERCUT),
+	LEVEL_UP_MOVE(38, MOVE_NOBLEROAR),
+	LEVEL_UP_MOVE(44, MOVE_DRAGONDANCE),
+	LEVEL_UP_MOVE(52, MOVE_OUTRAGE),
+	LEVEL_UP_MOVE(60, MOVE_CLOSECOMBAT),
+	LEVEL_UP_MOVE(68, MOVE_CLANGINGSCALES),
+	LEVEL_UP_MOVE(76, MOVE_CLANGOROUSSOUL),
+	LEVEL_UP_MOVE(82, MOVE_BOOMBURST),
 	LEVEL_UP_END
 };
 
@@ -16378,21 +16655,20 @@ static const struct LevelUpMove sGuzzlordLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_WIDEGUARD),
 	LEVEL_UP_MOVE( 1, MOVE_SWALLOW),
 	LEVEL_UP_MOVE( 1, MOVE_STOCKPILE),
-	LEVEL_UP_MOVE( 1, MOVE_DRAGONRAGE),
-	LEVEL_UP_MOVE( 1, MOVE_BITE),
-	LEVEL_UP_MOVE( 7, MOVE_STOMP),
-	LEVEL_UP_MOVE(13, MOVE_BRUTALSWING),
-	LEVEL_UP_MOVE(19, MOVE_STEAMROLLER),
-	LEVEL_UP_MOVE(23, MOVE_DRAGONTAIL),
-	LEVEL_UP_MOVE(29, MOVE_IRONTAIL),
-	LEVEL_UP_MOVE(31, MOVE_STOMPINGTANTRUM),
-	LEVEL_UP_MOVE(37, MOVE_CRUNCH),
-	LEVEL_UP_MOVE(43, MOVE_HAMMERARM),
-	LEVEL_UP_MOVE(47, MOVE_THRASH),
-	LEVEL_UP_MOVE(53, MOVE_GASTROACID),
-	LEVEL_UP_MOVE(59, MOVE_HEAVYSLAM),
-	LEVEL_UP_MOVE(67, MOVE_WRINGOUT),
-	LEVEL_UP_MOVE(73, MOVE_DRAGONRUSH),
+	LEVEL_UP_MOVE(10, MOVE_KNOCKOFF),
+	LEVEL_UP_MOVE(15, MOVE_STOMP),
+	LEVEL_UP_MOVE(20, MOVE_STOMPINGTANTRUM),
+	LEVEL_UP_MOVE(25, MOVE_WIDEGUARD),
+	LEVEL_UP_MOVE(30, MOVE_CRUNCH),
+	LEVEL_UP_MOVE(35, MOVE_BODYSLAM),
+	LEVEL_UP_MOVE(40, MOVE_GASTROACID),
+	LEVEL_UP_MOVE(45, MOVE_HAMMERARM),
+	LEVEL_UP_MOVE(50, MOVE_HEAVYSLAM),
+	LEVEL_UP_MOVE(55, MOVE_DRAGONRUSH),
+	LEVEL_UP_MOVE(60, MOVE_BELCH),
+	LEVEL_UP_MOVE(65, MOVE_THRASH),
+	LEVEL_UP_MOVE(70, MOVE_GIGAIMPACT),
+	LEVEL_UP_MOVE(75, MOVE_COREENFORCER),
 	LEVEL_UP_END
 };
 
@@ -16429,16 +16705,24 @@ static const struct LevelUpMove sMagearnaLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_DEFENSECURL),
 	LEVEL_UP_MOVE( 1, MOVE_PSYBEAM),
 	LEVEL_UP_MOVE( 9, MOVE_LUCKYCHANT),
-	LEVEL_UP_MOVE(17, MOVE_AURORABEAM),
-	LEVEL_UP_MOVE(25, MOVE_MIRRORSHOT),
-	LEVEL_UP_MOVE(33, MOVE_MINDREADER),
-	LEVEL_UP_MOVE(41, MOVE_FLASHCANNON),
-	LEVEL_UP_MOVE(49, MOVE_FLEURCANNON),
-	LEVEL_UP_MOVE(57, MOVE_IRONDEFENSE),
-	LEVEL_UP_MOVE(65, MOVE_PAINSPLIT),
-	LEVEL_UP_MOVE(73, MOVE_SYNCHRONOISE),
-	LEVEL_UP_MOVE(81, MOVE_AURASPHERE),
-	LEVEL_UP_MOVE(89, MOVE_HEARTSWAP),
+	LEVEL_UP_MOVE(12, MOVE_ROLLOUT),
+	LEVEL_UP_MOVE(16, MOVE_IRONDEFENSE),
+	LEVEL_UP_MOVE(20, MOVE_MIRRORSHOT),
+	LEVEL_UP_MOVE(24, MOVE_GEARUP),
+	LEVEL_UP_MOVE(30, MOVE_PSYBEAM),
+	LEVEL_UP_MOVE(30, MOVE_AURORABEAM),
+	LEVEL_UP_MOVE(36, MOVE_MINDREADER),
+	LEVEL_UP_MOVE(42, MOVE_SPIRITBREAK),
+	LEVEL_UP_MOVE(48, MOVE_SHIFTGEAR),
+	LEVEL_UP_MOVE(54, MOVE_CRAFTYSHIELD),
+	LEVEL_UP_MOVE(60, MOVE_IRONHEAD),
+	LEVEL_UP_MOVE(66, MOVE_AURASPHERE),
+	LEVEL_UP_MOVE(72, MOVE_FLASHCANNON),
+	LEVEL_UP_MOVE(75, MOVE_SYNCHRONOISE),
+	LEVEL_UP_MOVE(78, MOVE_PAINSPLIT),
+	LEVEL_UP_MOVE(84, MOVE_ZAPCANNON),
+	LEVEL_UP_MOVE(90, MOVE_FLEURCANNON),
+	LEVEL_UP_MOVE(94, MOVE_HEARTSWAP),
 	LEVEL_UP_MOVE(97, MOVE_TRUMPCARD),
 	LEVEL_UP_END
 };
@@ -16521,21 +16805,22 @@ static const struct LevelUpMove sRaichuALevelUpLearnset[] = {
 static const struct LevelUpMove sSandshrewALevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_SCRATCH),
 	LEVEL_UP_MOVE( 1, MOVE_DEFENSECURL),
-	LEVEL_UP_MOVE( 3, MOVE_BIDE),
-	LEVEL_UP_MOVE( 5, MOVE_POWDERSNOW),
-	LEVEL_UP_MOVE( 7, MOVE_ICEBALL),
-	LEVEL_UP_MOVE( 9, MOVE_RAPIDSPIN),
-	LEVEL_UP_MOVE(11, MOVE_FURYCUTTER),
-	LEVEL_UP_MOVE(14, MOVE_METALCLAW),
-	LEVEL_UP_MOVE(17, MOVE_SWIFT),
-	LEVEL_UP_MOVE(20, MOVE_FURYSWIPES),
-	LEVEL_UP_MOVE(23, MOVE_IRONDEFENSE),
-	LEVEL_UP_MOVE(26, MOVE_SLASH),
-	LEVEL_UP_MOVE(30, MOVE_IRONHEAD),
-	LEVEL_UP_MOVE(34, MOVE_GYROBALL),
-	LEVEL_UP_MOVE(38, MOVE_SWORDSDANCE),
-	LEVEL_UP_MOVE(42, MOVE_HAIL),
-	LEVEL_UP_MOVE(46, MOVE_BLIZZARD),
+	LEVEL_UP_MOVE( 3, MOVE_MIST),
+	LEVEL_UP_MOVE( 6, MOVE_POWDERSNOW),
+	LEVEL_UP_MOVE( 9, MOVE_ROLLOUT),
+	LEVEL_UP_MOVE(12, MOVE_METALCLAW),
+	LEVEL_UP_MOVE(15, MOVE_RAPIDSPIN),
+	LEVEL_UP_MOVE(18, MOVE_ICEBALL),
+	LEVEL_UP_MOVE(21, MOVE_FURYSWIPES),
+	LEVEL_UP_MOVE(24, MOVE_FURYCUTTER),
+	LEVEL_UP_MOVE(27, MOVE_SWIFT),
+	LEVEL_UP_MOVE(30, MOVE_IRONDEFENSE),
+	LEVEL_UP_MOVE(33, MOVE_SLASH),
+	LEVEL_UP_MOVE(36, MOVE_IRONHEAD),
+	LEVEL_UP_MOVE(39, MOVE_SWORDSDANCE),
+	LEVEL_UP_MOVE(42, MOVE_GYROBALL),
+	LEVEL_UP_MOVE(45, MOVE_HAIL),
+	LEVEL_UP_MOVE(48, MOVE_BLIZZARD),
 	LEVEL_UP_END
 };
 
@@ -16543,7 +16828,16 @@ static const struct LevelUpMove sSandslashALevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 0, MOVE_ICICLESPEAR),
 	LEVEL_UP_MOVE( 1, MOVE_ICICLESPEAR),
 	LEVEL_UP_MOVE( 1, MOVE_METALBURST),
-	LEVEL_UP_MOVE( 1, MOVE_ICICLECRASH),
+	LEVEL_UP_MOVE( 1, MOVE_SCRATCH),
+	LEVEL_UP_MOVE( 1, MOVE_MIST),
+	LEVEL_UP_MOVE( 1, MOVE_POWDERSNOW),
+	LEVEL_UP_MOVE( 1, MOVE_ROLLOUT),
+	LEVEL_UP_MOVE( 1, MOVE_RAPIDSPIN),
+	LEVEL_UP_MOVE( 1, MOVE_ICEBALL),
+	LEVEL_UP_MOVE( 1, MOVE_FURYSWIPES),
+	LEVEL_UP_MOVE( 1, MOVE_FURYCUTTER),
+	LEVEL_UP_MOVE( 1, MOVE_SWIFT),
+	LEVEL_UP_MOVE( 1, MOVE_IRONDEFENSE),
 	LEVEL_UP_MOVE( 1, MOVE_SLASH),
 	LEVEL_UP_MOVE( 1, MOVE_DEFENSECURL),
 	LEVEL_UP_MOVE( 1, MOVE_ICEBALL),
@@ -16881,26 +17175,29 @@ static const struct LevelUpMove sDeoxysSpeedLevelUpLearnset[] = {
 
 static const struct LevelUpMove sLycanrocNLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 0, MOVE_COUNTER),
-	LEVEL_UP_MOVE( 1, MOVE_COUNTER),
+	LEVEL_UP_MOVE( 1, MOVE_ACCELEROCK),
+	LEVEL_UP_MOVE( 1, MOVE_ENDURE),
 	LEVEL_UP_MOVE( 1, MOVE_REVERSAL),
 	LEVEL_UP_MOVE( 1, MOVE_TAUNT),
-	LEVEL_UP_MOVE( 1, MOVE_TACKLE),
+	LEVEL_UP_MOVE( 1, MOVE_ODORSLEUTH),
 	LEVEL_UP_MOVE( 1, MOVE_LEER),
+	LEVEL_UP_MOVE( 1, MOVE_TACKLE),
 	LEVEL_UP_MOVE( 1, MOVE_SANDATTACK),
-	LEVEL_UP_MOVE( 1, MOVE_BITE),
-	LEVEL_UP_MOVE( 4, MOVE_SANDATTACK),
-	LEVEL_UP_MOVE( 7, MOVE_BITE),
-	LEVEL_UP_MOVE(12, MOVE_HOWL),
-	LEVEL_UP_MOVE(15, MOVE_ROCKTHROW),
-	LEVEL_UP_MOVE(18, MOVE_ODORSLEUTH),
+	LEVEL_UP_MOVE( 1, MOVE_DOUBLETEAM),
+	LEVEL_UP_MOVE(12, MOVE_ROCKTHROW),
+	LEVEL_UP_MOVE(16, MOVE_HOWL),
+	LEVEL_UP_MOVE(19, MOVE_BITE),
 	LEVEL_UP_MOVE(23, MOVE_ROCKTOMB),
-	LEVEL_UP_MOVE(26, MOVE_ROAR),
-	LEVEL_UP_MOVE(29, MOVE_STEALTHROCK),
-	LEVEL_UP_MOVE(34, MOVE_ROCKSLIDE),
-	LEVEL_UP_MOVE(37, MOVE_SCARYFACE),
-	LEVEL_UP_MOVE(40, MOVE_CRUNCH),
-	LEVEL_UP_MOVE(45, MOVE_ROCKCLIMB),
-	LEVEL_UP_MOVE(48, MOVE_STONEEDGE),
+	LEVEL_UP_MOVE(24, MOVE_COUNTER),
+	LEVEL_UP_MOVE(29, MOVE_ROAR),
+	LEVEL_UP_MOVE(33, MOVE_CRUNCH),
+	LEVEL_UP_MOVE(38, MOVE_ROCKSLIDE),
+	LEVEL_UP_MOVE(43, MOVE_SCARYFACE),
+	LEVEL_UP_MOVE(47, MOVE_ROCKCLIMB),
+	LEVEL_UP_MOVE(52, MOVE_STEALTHROCK),
+	LEVEL_UP_MOVE(56, MOVE_PLAYROUGH),
+	LEVEL_UP_MOVE(61, MOVE_STONEEDGE),
+	LEVEL_UP_MOVE(66, MOVE_CLOSECOMBAT),
 	LEVEL_UP_END
 };
 
@@ -16996,27 +17293,33 @@ static const struct LevelUpMove sZeraoraLevelUpLearnset[] = {
 };
 
 static const struct LevelUpMove sLycanrocDuskLevelUpLearnset[] = {
-	LEVEL_UP_MOVE( 0, MOVE_THRASH),
+	LEVEL_UP_MOVE( 0, MOVE_CRUSHCLAW),
+	LEVEL_UP_MOVE( 1, MOVE_THUNDERFANG),
 	LEVEL_UP_MOVE( 1, MOVE_THRASH),
 	LEVEL_UP_MOVE( 1, MOVE_ACCELEROCK),
 	LEVEL_UP_MOVE( 1, MOVE_COUNTER),
-	LEVEL_UP_MOVE( 1, MOVE_TACKLE),
+	LEVEL_UP_MOVE( 1, MOVE_ENDURE),
+	LEVEL_UP_MOVE( 1, MOVE_REVERSAL),
+	LEVEL_UP_MOVE( 1, MOVE_TAUNT),
+	LEVEL_UP_MOVE( 1, MOVE_ODORSLEUTH),
 	LEVEL_UP_MOVE( 1, MOVE_LEER),
+	LEVEL_UP_MOVE( 1, MOVE_TACKLE),
 	LEVEL_UP_MOVE( 1, MOVE_SANDATTACK),
-	LEVEL_UP_MOVE( 1, MOVE_BITE),
-	LEVEL_UP_MOVE( 4, MOVE_SANDATTACK),
-	LEVEL_UP_MOVE( 7, MOVE_BITE),
-	LEVEL_UP_MOVE(12, MOVE_HOWL),
-	LEVEL_UP_MOVE(15, MOVE_ROCKTHROW),
-	LEVEL_UP_MOVE(18, MOVE_ODORSLEUTH),
+	LEVEL_UP_MOVE( 1, MOVE_DOUBLETEAM),
+	LEVEL_UP_MOVE(12, MOVE_ROCKTHROW),
+	LEVEL_UP_MOVE(16, MOVE_HOWL),
+	LEVEL_UP_MOVE(19, MOVE_BITE),
 	LEVEL_UP_MOVE(23, MOVE_ROCKTOMB),
-	LEVEL_UP_MOVE(26, MOVE_ROAR),
-	LEVEL_UP_MOVE(29, MOVE_STEALTHROCK),
-	LEVEL_UP_MOVE(34, MOVE_ROCKSLIDE),
-	LEVEL_UP_MOVE(37, MOVE_SCARYFACE),
-	LEVEL_UP_MOVE(40, MOVE_CRUNCH),
-	LEVEL_UP_MOVE(45, MOVE_ROCKCLIMB),
-	LEVEL_UP_MOVE(48, MOVE_STONEEDGE),
+	LEVEL_UP_MOVE(24, MOVE_CRUSHCLAW),
+	LEVEL_UP_MOVE(29, MOVE_ROAR),
+	LEVEL_UP_MOVE(33, MOVE_CRUNCH),
+	LEVEL_UP_MOVE(38, MOVE_ROCKSLIDE),
+	LEVEL_UP_MOVE(43, MOVE_SCARYFACE),
+	LEVEL_UP_MOVE(47, MOVE_ROCKCLIMB),
+	LEVEL_UP_MOVE(52, MOVE_STEALTHROCK),
+	LEVEL_UP_MOVE(56, MOVE_PLAYROUGH),
+	LEVEL_UP_MOVE(61, MOVE_STONEEDGE),
+	LEVEL_UP_MOVE(66, MOVE_CLOSECOMBAT),
 	LEVEL_UP_END
 };
 
diff --git a/src/tm_compatibility/30 - Shadow Ball.txt b/src/tm_compatibility/30 - Shadow Ball.txt
index 39eeb60..a3890ae 100644
--- a/src/tm_compatibility/30 - Shadow Ball.txt	
+++ b/src/tm_compatibility/30 - Shadow Ball.txt	
@@ -33,6 +33,9 @@ HAUNTER
 GENGAR
 DROWZEE
 HYPNO
+EXEGGCUTE
+EXEGGCUTE_A
+EXEGGUTOR
 MAROWAK_A
 LICKITUNG
 KOFFING
diff --git a/src/tm_compatibility/33 - Reflect.txt b/src/tm_compatibility/33 - Reflect.txt
index 64d7e3b..edb6879 100644
--- a/src/tm_compatibility/33 - Reflect.txt	
+++ b/src/tm_compatibility/33 - Reflect.txt	
@@ -97,6 +97,8 @@ LUNATONE
 SOLROCK
 BALTOY
 CLAYDOL
+VOLBEAT
+ILLUMISE
 CHIMECHO
 METANG
 METAGROSS
diff --git a/src/tm_compatibility/46 - Thief.txt b/src/tm_compatibility/46 - Thief.txt
index 27270b1..b7bb4f2 100644
--- a/src/tm_compatibility/46 - Thief.txt	
+++ b/src/tm_compatibility/46 - Thief.txt	
@@ -216,6 +216,7 @@ STARAVIA
 STARAPTOR
 BIDOOF
 BIBAREL
+KRICKETUNE
 SHINX
 LUXIO
 LUXRAY
diff --git a/src/tm_compatibility/62 - Silver Wind.txt b/src/tm_compatibility/62 - Silver Wind.txt
index 49b21a1..9527416 100644
--- a/src/tm_compatibility/62 - Silver Wind.txt	
+++ b/src/tm_compatibility/62 - Silver Wind.txt	
@@ -28,6 +28,9 @@ VIBRAVA
 FLYGON
 TROPIUS
 KRICKETUNE
+WORMADAM
+WORMADAM_SANDY
+WORMADAM_TRASH
 MOTHIM
 VESPIQUEN
 DRIFLOON
diff --git a/src/tm_compatibility/99 - Wild Charge.txt b/src/tm_compatibility/99 - Wild Charge.txt
index 4f0b490..ef38757 100644
--- a/src/tm_compatibility/99 - Wild Charge.txt	
+++ b/src/tm_compatibility/99 - Wild Charge.txt	
@@ -67,6 +67,8 @@ SPINDA
 SHINX
 LUXIO
 LUXRAY
+CRANIDOS
+RAMPARDOS
 MAGNEZONE
 ELECTIVIRE
 VICTINI
diff --git a/src/tutor_compatibility/110 - High Horsepower.txt b/src/tutor_compatibility/110 - High Horsepower.txt
index e80deba..c141f71 100644
--- a/src/tutor_compatibility/110 - High Horsepower.txt	
+++ b/src/tutor_compatibility/110 - High Horsepower.txt	
@@ -49,6 +49,16 @@ KROOKODILE
 GOLURK
 BOUFFALANT
 DIGGERSBY
+FURFROU
+FURFROU_HEART
+FURFROU_DIAMOND
+FURFROU_STAR
+FURFROU_PHAROAH
+FURFROU_KABUKI
+FURFROU_LA_REINE
+FURFROU_MATRON
+FURFROU_DANDY
+FURFROU_DEBUTANTE
 TYRANTRUM
 AVALUGG
 ZYGARDE
diff --git a/src/tutor_compatibility/115 - Play Rough.txt b/src/tutor_compatibility/115 - Play Rough.txt
index 74e3034..e67d114 100644
--- a/src/tutor_compatibility/115 - Play Rough.txt	
+++ b/src/tutor_compatibility/115 - Play Rough.txt	
@@ -88,6 +88,8 @@ MINCCINO
 CINCCINO
 CUBCHOO
 BEARTIC
+RUFFLET
+BRAVIARY
 ESPURR
 MEOWSTIC
 MEOWSTIC_FEMALE
diff --git a/src/tutor_compatibility/117 - Power Gem.txt b/src/tutor_compatibility/117 - Power Gem.txt
index b9f8590..e5ebafd 100644
--- a/src/tutor_compatibility/117 - Power Gem.txt	
+++ b/src/tutor_compatibility/117 - Power Gem.txt	
@@ -1,12 +1,14 @@
 Tutor 117: Power Gem
 PERSIAN
 PERSIAN_A
+GOLDUCK
 STARYU
 STARMIE
 MEW
 MAREEP
 FLAAFFY
 AMPHAROS
+ESPEON
 SLOWKING
 MISDREAVUS
 CORSOLA
diff --git a/src/tutor_compatibility/123 - Hurricane.txt b/src/tutor_compatibility/123 - Hurricane.txt
index 043aba1..f1c7ab3 100644
--- a/src/tutor_compatibility/123 - Hurricane.txt	
+++ b/src/tutor_compatibility/123 - Hurricane.txt	
@@ -19,12 +19,16 @@ MANTINE
 KINGDRA
 LUGIA
 SHIFTRY
+BEAUTIFLY
 TAILLOW
 SWELLOW
 WINGULL
 PELIPPER
+MASQUERAIN
+TROPIUS
 CASTFORM
 SALAMENCE
+MOTHIM
 HONCHKROW
 UNFEZANT
 UNFEZANT_F
diff --git a/src/tutor_compatibility/2 - Ice Punch.txt b/src/tutor_compatibility/2 - Ice Punch.txt
index 20423b1..7a66453 100644
--- a/src/tutor_compatibility/2 - Ice Punch.txt	
+++ b/src/tutor_compatibility/2 - Ice Punch.txt	
@@ -22,6 +22,12 @@ ALAKAZAM
 MACHOP
 MACHOKE
 MACHAMP
+GEODUDE
+GEODUDE_A
+GRAVELER
+GRAVELER_A
+GOLEM
+GOLEM_A
 SLOWBRO
 GRIMER
 GRIMER_A
diff --git a/src/tutor_compatibility/32 - Zen Headbutt.txt b/src/tutor_compatibility/32 - Zen Headbutt.txt
index a56a8d4..ff82961 100644
--- a/src/tutor_compatibility/32 - Zen Headbutt.txt	
+++ b/src/tutor_compatibility/32 - Zen Headbutt.txt	
@@ -28,6 +28,7 @@ SLOWPOKE_G
 SLOWBRO
 DROWZEE
 HYPNO
+ONIX
 EXEGGUTOR
 EXEGGUTOR_A
 LICKITUNG
@@ -53,6 +54,7 @@ ESPEON
 SLOWKING
 GIRAFARIG
 DUNSPARCE
+STEELIX
 PORYGON2
 STANTLER
 SMOOCHUM
diff --git a/src/tutor_compatibility/33 - Seed Bomb.txt b/src/tutor_compatibility/33 - Seed Bomb.txt
index d93f42d..eac1885 100644
--- a/src/tutor_compatibility/33 - Seed Bomb.txt	
+++ b/src/tutor_compatibility/33 - Seed Bomb.txt	
@@ -68,6 +68,7 @@ CACNEA
 CACTURNE
 LILEEP
 CRADILY
+KECLEON
 TROPIUS
 TURTWIG
 GROTLE
diff --git a/src/tutor_compatibility/48 - Earth Power.txt b/src/tutor_compatibility/48 - Earth Power.txt
index efb70ba..c99b916 100644
--- a/src/tutor_compatibility/48 - Earth Power.txt	
+++ b/src/tutor_compatibility/48 - Earth Power.txt	
@@ -27,6 +27,7 @@ KABUTO
 KABUTOPS
 AERODACTYL
 MEW
+MEGANIUM
 SUDOWOODO
 SUNKERN
 SUNFLORA
@@ -96,6 +97,7 @@ HIPPOPOTAS
 HIPPOPOTAS_F
 HIPPOWDON
 HIPPOWDON_F
+CARNIVINE
 ABOMASNOW
 RHYPERIOR
 GLISCOR
diff --git a/src/tutor_compatibility/52 - Hyper Voice.txt b/src/tutor_compatibility/52 - Hyper Voice.txt
index b94cf55..6b74dbd 100644
--- a/src/tutor_compatibility/52 - Hyper Voice.txt	
+++ b/src/tutor_compatibility/52 - Hyper Voice.txt	
@@ -68,6 +68,7 @@ SPINDA
 SWABLU
 ALTARIA
 CHIMECHO
+GLALIE
 BAGON
 SHELGON
 SALAMENCE
diff --git a/src/tutor_compatibility/54 - Knock Off.txt b/src/tutor_compatibility/54 - Knock Off.txt
index 9bff179..0c3e182 100644
--- a/src/tutor_compatibility/54 - Knock Off.txt	
+++ b/src/tutor_compatibility/54 - Knock Off.txt	
@@ -52,7 +52,9 @@ FARFETCHD
 FARFETCHD_G
 DODUO
 DODRIO
+GRIMER
 GRIMER_A
+MUK
 MUK_A
 GASTLY
 HAUNTER
diff --git a/src/tutor_compatibility/74 - Toxic Spikes.txt b/src/tutor_compatibility/74 - Toxic Spikes.txt
index 69a4176..a3d789e 100644
--- a/src/tutor_compatibility/74 - Toxic Spikes.txt	
+++ b/src/tutor_compatibility/74 - Toxic Spikes.txt	
@@ -1,5 +1,7 @@
 Tutor 74: Toxic Spikes
 BEEDRILL
+EKANS
+ARBOK
 NIDORAN_F
 NIDORINA
 NIDOQUEEN
diff --git a/src/tutor_compatibility/77 - Nasty Plot.txt b/src/tutor_compatibility/77 - Nasty Plot.txt
index 0b60009..15059df 100644
--- a/src/tutor_compatibility/77 - Nasty Plot.txt	
+++ b/src/tutor_compatibility/77 - Nasty Plot.txt	
@@ -120,6 +120,8 @@ ZOROARK
 GOTHITA
 GOTHORITA
 GOTHITELLE
+DUCKLETT
+SWANNA
 ELGYEM
 BEHEEYEM
 VULLABY
diff --git a/src/tutor_compatibility/89 - Thunder Fang.txt b/src/tutor_compatibility/89 - Thunder Fang.txt
index 48e20c0..f6929a7 100644
--- a/src/tutor_compatibility/89 - Thunder Fang.txt	
+++ b/src/tutor_compatibility/89 - Thunder Fang.txt	
@@ -1,4 +1,6 @@
 Tutor 89: Thunder Fang
+RATTATA
+RATICATE
 ARBOK
 ARCANINE
 RHYHORN
diff --git a/src/tutor_compatibility/90 - Ice Fang.txt b/src/tutor_compatibility/90 - Ice Fang.txt
index 6ca9b55..1868e7c 100644
--- a/src/tutor_compatibility/90 - Ice Fang.txt	
+++ b/src/tutor_compatibility/90 - Ice Fang.txt	
@@ -1,4 +1,6 @@
 Tutor 90: Ice Fang
+RATTATA
+RATICATE
 ARBOK
 RHYHORN
 RHYDON
@@ -26,6 +28,7 @@ SNORUNT
 GLALIE
 WALREIN
 HUNTAIL
+BIBAREL
 SHINX
 LUXIO
 LUXRAY
diff --git a/src/tutor_compatibility/91 - Fire Fang.txt b/src/tutor_compatibility/91 - Fire Fang.txt
index 9105028..13a805d 100644
--- a/src/tutor_compatibility/91 - Fire Fang.txt	
+++ b/src/tutor_compatibility/91 - Fire Fang.txt	
@@ -2,6 +2,8 @@ Tutor 91: Fire Fang
 CHARMANDER
 CHARMELEON
 CHARIZARD
+RATTATA
+RATICATE
 ARBOK
 GROWLITHE
 ARCANINE

From 7b452274dda2f7c8b137091c0a53a3fc68a381de Mon Sep 17 00:00:00 2001
From: Skeli <sesyl.schweitzer@gmail.com>
Date: Mon, 26 Apr 2021 14:42:41 -0400
Subject: [PATCH 5/9] Update Shadow Warrior Sprite

---
 graphics/frontspr/gSpriteShadowWarrior.png | Bin 0 -> 6503 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 graphics/frontspr/gSpriteShadowWarrior.png

diff --git a/graphics/frontspr/gSpriteShadowWarrior.png b/graphics/frontspr/gSpriteShadowWarrior.png
new file mode 100644
index 0000000000000000000000000000000000000000..0efcafbb118b50fdb2cf9f87fad1e39c6f9e0bb0
GIT binary patch
literal 6503
zcmV-t8JOmYP)<h;3K|Lk000e1NJLTq002M$002M)0{{R3SVwH_000(^dQ@0+Qek%>
zaB^>EX>4U6ba`-PAZ2)IW&i+q+O3*tawa!(g#Y6dK0;#$j)OJAH}LWOB+%q=IMioJ
z;i1H(-(CPzR#s-A&HA7J-sZpfmwXB)#9UHM>EU0fp}NK|<+=avPy2-P{rn5>NBsTU
zar60s<B;d4zkjCnp5Hhge_fE@3vB=WxXI(aPkC=-KW}{gc|BRbzvq?rM&8}y_Wj$`
z_qrCoOy~XIjrX?i&A<O0GK(=I_w&xU<*k4CUi1`y|8E?#=X>NN%dzHzujhOCdF{;S
zuiqB$^S5tn_q6x8|9vUUlim~3w>5f?+xYFc|9p)5ZAA9hlYjeQM4O+l|Guo<-m~nz
z?(AAftW+}Zq&}u{e&fW>Qu=dQ;w$ri<oA5ODqn>u4k9**X6I`dTdiZYw+(jMX187E
z=dgnz2De=1r*p&kbFBF6svBM*2>P<yWx_CxFT`XJHP2!9ITm}KThH@`Ej)Qz&UBWW
zDT;r5nV$~+o3GCs?Jek9`;^bMVq8v`W*CZ`zH=4<vHM-qc-HrPnJ>6`z6912!FZOr
zFv0fpdy5|JFKqb}XU}=@3Fb{_o9BB2mWXFZ1_Qc-eG>4t$v)Y+Y%S|ph)-kW&Ii|t
zfQ`{jYc{d*J`tSa^lYxl_MGdYyN96`0ug=knb43Z1S^CHesU;as6`)xi7}>_V~I63
z5mbsPrJTf3E&CjD%qizwa?P#y5=tzo<Wfp4t-9)=uvk;grj}Z3Ydo}Z>&DfMGg|Ae
z`yP7ispnpL?QH;`5k?$o<WWW)ZMx|v=|9uVW|moJTXq4Z6;@nn<yBT)ZG*M#ci3^K
zop;%Fx6i1(QT;t?_FLrsbJXk`HAO6(^YX8#aX9CXTUgOaRLqE&3zmpyMF2oM#q23I
z1gFR;W>0k_MRY{XMg?bDMT`iBWnJ9%Gj_is_aEbCV)#dKbAJ^%qtN|-M9wI5Z{+@r
z+YeEj?Nk(h0;DX|nm&F*Y-{s;R~k$*@}u7<P5<C$AI0xwEK}bzbmCh*-=2rD_0i!s
z-^ZMD_c@Z^v+A?eXX>_vxmFI)+jMzb){CiaYW8TA6aC&{Zk=w&dr@Fg?a6iX9Ii=g
zj=V?r=kwUwZoRv`T3^ZJN%&%}0mQkLH}ib*X05VLPB!G9k4NtAYEIs6{_x${)n<qm
zP}oxRQ#JTs{51dhggn+<K5W}Gu<UvI-bJfg`Wks9%`|QAvsuvnUSI+&?$zVu;_Nj1
zT25VJRo3*4liOT1*gOJ@Wmj#T@{!W?AY(tK^%%>Uw*@eZ5$ur)^Uu5I-C|Z+O|G?x
zm0uyPT|0LgIgJR$xUJ$ejl$6z#l|h399he8PMlmYc5J;2g7a`MXg7lpA~aT>t<?2w
z&%DMgBX`#5343Kdh&0`~G4GK86gWTeVdy(WQX#A%(B?e6UoNp$!Fry(SE)O(MxAk<
zHA!{FG-l<n9;&&8wsUN|7S_=^fgqpT4-V{^8dt9;>4+H&i#bjGu@h_Z%v3^NE@T)4
z`p}ZDz7ItBb%YbqD6RJOr}=*1@BhpLJl0KAON`ab$be!|q3tI~QMh^HnSgudiyYFa
z=QZm^j@X>(3pmqi74kAQjs>_`Tmgm~5X7D!nKGwc9TJ42R#C2Z_>e{Ky9YwG=O*7_
z9dN{yjY0{@R0adv4*%DuzGs#hp|Fi80vF6|g8@IgNr=$`V>S3K`Ndpr6o!Mj6C(}!
zt25FDx!mY_Za!xhB{V&N>~N;90M$RK>1f_8!5sUH1Asb4;R}dP@a{;kqjK+I9E!69
z@!GM}Mxa49=yPD)dGdyjht(u>M(YsTX1Vr57V^BqMG8|B-YBqe6(X-#64D4?wGk84
zrHcf~E6?i5KF4iYs=ftIv|r&YmLTr9kbI9PI>{ddrezKgdvtwfF>F;Gp<Gn}O;z!!
zUQR)or2hyk^KXz?pFgR_9IkQDe}bPfaZ&D$eHf&bpSfv03)E_9A(nkeWmB?&i6$Oh
znB&=jt2eAtd3rx3j%w)VqHqon(7zoWP(B5<BWpaX8#*B0!ihu7i~~M?A?VprnWB&*
zJg(k67lZ)=PA0H9lya>_b&WgQ%2aZrPWFy9vWP%rIK(sIwocB2`~}En<))dEHU`WK
z5TY2`iUgx!B<m3Ef}tp7<Z`E6E0-mLe+%(Pgj=KXtQebY7$jgh#q>vj08=m*`43N{
zsD={#Aa#ox07D0^=SHajc9Mfk?n{|GR)QF^VTxJGgb&|(ZvRbLi{}3*Yf?GsT^?fn
zE{}be$Difdq628eFJHIH{csRodNcuQAYzBuyiAr=1HYF*1SO?mK7hb=lXGeV=^l0<
zq6*6HLL`aGNsA;sHEz|j_<H7^xnY*@S-S(_c}Hm!J)Xg1QxAd^TBnk;OQBMoKyTzG
z<px>Q<|v0*)r3kpHReZ}hiYXWG+jAhA21bau`k!)-#DaZKrjRbkhVu@PRj5_FXM<L
zQz5wH>J!L6ESM0jjp}4YDRaA81QE+iF+@g*WmPFqQ$BLTIZs7w0Ay9GOyg6gRyBdM
zz#)%#pod6jT_L+CiwWVoDuN@1@7=r8NT|T8qK1j8%cfPH)zV5ecGxZ;xJ5q$6s~{5
zFXr!_s9OW-aZC17s0PxYhg6l2X4f-pmRiG3C)mC+p%$O&VVVLzb%2kBmd2h(Kj==B
z|3n=PXb{js$?mE@uZSR@Cb}t!Z3rN7U4)(0viWK#2_xz!stU{_Zh-1I)MijP*|SPO
zlAsPT0Ci3Y3*8ZW8>*Ynj#v%MMn#g$6B;ly52JOlrkh6mbjzvkSkKtFO2m4Ub-3hF
z&i5;dfgVU0N|;^`%t$>WFfgE;ZN0+Ep67Ydvp=_*@-p%l!lH0{uvn$&gvA--1Kg==
z^QgZ7ZkHeBR8XOR?b4EnVA{T<zIG^z2hmdfWsE)Y8LkNtAo8b--H?W(+mHdVW4Lw<
z?I|gR{S~P37f?lfA3)_7^CI;l<XNmdn2l6vzm#G#e8^|67iuV_GC$-aY#4UG8b20m
zM*Fvl?N8|!x5F+HW3gbC+D*PAaypI;2^4*(7iXHEJ(LC?Ve!Z=0)W`)Js6e@h%;fF
z4`5%^GNA}^^=D!u-<6{j|E}xW4xB-TUg2#3Ck}KKI0Pfqr6>`MTOwPbPtE^+keiC`
zis<ohX63<v(7Z@#(9#&sxQhD`-FvrB-Dd#QNg!Jx3|ZI(1)}k#*(}hfta?;!J?YZz
zulV>h1EP%S7cA`+^X^K$&gE!Tr_)JIq@}V^Z3V&)<zoVsr4TAlovI~QW?iW!<hG6*
zA?9binFK1_ijhTXGdIG98Tqg%u6uo0)yPSL4<9Cu|5}4qm>Hvl9+^b>4H06-NX2^9
z_iHhSEDT`xrI0NV3bNLQ1&fFR(y7H5rtQb6%1zzk^V2-v4*dO}j629>uc%cvI9_BH
ztN6*If3WBw(JM_qXcRj9l~pAGXZikk@C+$jJo7-8MKmRq9&mv(6i}-;UA}gTNdtIa
zBW`ZUQBzp<ox+sIM-k%+HkCVSt(y#LleBE=U#ry4F;(Rwutb}JlxmJTkh-!8%p{t1
zz5=AhSAe{VFp9|}KokU}8mA!j)|S*aGP!&lC%DZrO{@$hx;8b6k|%wbCdu`XX_%Ub
zWkN|ps(+CpJc05EY+kR+ns6g31sFI!Ypc^>EC2NpW_%w+7O_MW9FNY9Gr$XI21^RW
zn?c)ZDaFF*0Hn$_-h5`o@J=L$8l~*@rowMeUGwNiq=UV7%Jo{>s?sY&WSmeVd{lEn
z!_j8sm_PoqfQ?Ux!biURYe;_mY4~L$tIIl1@oEtFTy7sJ$3g7`rIx_0^eBDy9eG&5
z3|v50PhDj`236cV-r@|FODL~hu8j1g1THz?dgN5<u6;R+7(}oSmLLXKhG}6HnK(R3
z5Yt?IRDbY+$`?FP_wYOBCyQAT0{xcGCc=R)Yub)ALb@`7jAS^%4}aI7Kz~QI-%(wW
zmlQ5Utb94J3&0)25i<a$KxTBOIzcHtiATh!e84)R6#FSCGnUiw$+E=>HcFB-XyLST
zgzg|NQY0cv$m4P}DKs^e4^@3cMz>VmopP}XSK-p#KHBgI3e1}&%_~*JQ|Z4`YmY;@
zZhz%^61`pxb&0yoZ?)J2JQ*B>dTh7)q9#}P=XS*W{DGB?{t-O`vGNN9Ro%BTPeYSP
z-T{svrx9h?F?Ax)if<6f!&4xjYf8h_mTq!)B{#G`eN1JVS|K3EN)PK&v?_g%>_m3R
zPcW9{ISH1)G&?IO)TE32Q?3cdPy^wx5sbp}IhRU&EH>jX`fn!2L(!*8vQ%f<O`^l`
zC@C3cV+CNV$S~3^t4!eFHxyg$OsA&~p@N=>I#HqS)1i@IanTo`ZKspl%<amGn~Q{M
z>Eoo>QOWCd&a7y!ft64>A0sSnJ_;aL#~r0(ZZ-H3YNae>1+L9GH42A1km`?|r3ya2
zEj|U*ZKG<R)rI@1vQsr;a~?Jg;d+!6>+<EF_iFzFWk|eZDG{PK8L~5>02Lfrf`y&>
z_G|j1eh}is8)J|3SEr8kqC)Jlt_CK|P|SmmC1YVALz%IW#CAytS}n|W!hDuY3x-6T
zK7gbnKd=|jv@P;(^OO&&hf_zZrjl7P!cZlZd_Pi2y9MIPAAD+m8iHQecYg;?S@qR4
zHP?P>(=!I_GVzdty19Sa>(w3s#AEnnWHkWcu5GM%kAsNToheOjz|{+VvLRNK$7^<g
z15U&t?N7?i^_px}4lm6IW~Zb)@YuRN)Jc?Xjq@z1nswhaE=f(cH0oqR3!=6?go<}S
zM64oCUS}gBld~)zK3gpzH<jS)k=F5xq{7_v)6`LabzCF(;lYjeh~Ub+S#+S$+iAmM
ze){c&_NgAv^eQ0vZAbCISh>}bx<m!Us>XObdy#nsG8Qv{j6ru4xFMaA^GKnJT#jVL
z#=z)VP$Vg(6FxeN=4~xz!0*54(xXZdr)t@$r-iVJVyNW_Wef-+ce_L_jH64<ztf?k
zsK+Cfp<S0rFo;@(xFD~O=3>41|Jf^)aIs)gLqsYMI}v2pwmP+e;B>iU(>W7J$szgE
zP{c0!49BX=d^mRH%dt>01$0zLjzNn+tMt3c1EoK=ia@Mt8$q$Ba$lvSDtq-@5J5Y%
z(~?A%{DR=FxS+bXL@9m@E6u;15RuynuGnYP?8^kF8~^Ep;`7b3ac?J1RU_&O#vYsk
z0|?R%5$IO5?HEzcTuptioaI867o^+{Knd^mg;h_~oEDW@=U|>RJ$4E%msp-!#ln3L
z5aeSpt$x&fhUmeQHXHmGcLZ=g-BFW9e%;YL8dQBE@_r#0b7=)msmrR(k6!l!VTrwO
z*367d=Q$+wbGC614KJY}R>^!s`A4sx2e4}Ow_ZOnZ#aC&Uo#ZHWF|h!ybTm}ljG7G
zFHQ2RMvNDA7ghGUdwB5o5@7xf_4^{~W)fe#ltDHBZl;F+YNo=6nTnX#mA~bMf<R(C
zXi!sSq^#VKM<8n3Iw=X$F#}>f?U&uY>hVkJL9WxWRB^BEDuhn1Ng`CToaHz<86Lp6
z)@gf6M&8c1P%5BL?UMaqYLl_JkJIDA{GA?GJ}oYvDCG6<vl{9C+@_FnI0={2WNfgD
zJ)4QTA+l!aj^rJw&s3-|MRk5&9e`NY7WN5Z$ls@<*>JnkrH@d`X(33lhoxyZ^BFiQ
z*!<mJI9d930-mdUmNtIfkw0h~$o5##mTnL2c3k5EX-LH_@w|4v3P0USb|iQbMK*{A
z;0yMtwT3%Lh7eF(gt{eUmZ(iCf%5Tpk5z5(OJd`$*sULhg6ow_7<AIbnmCUvJ`MYf
zmm5htw=?AYJ175N6#SQ*{R1su_<3!5bPI`6-CeZccSES=Pt_`M`L)GFVFT3&dKk7q
zZZaZU`&3j$^}v>11{j89RQn&y0A~jjg&$6=r(D)o{Jw2%;)pcuKf%D@v3d`GG|1Gn
zsUj3y5e7b53hGz<eZUWnyLdLg1KRyLDXzEi>;Z`ONZ=wLsIA!W8rCKGWZvHW>6gL=
zsJEY5q#amgaC%bsywSkg`mze<YHV$m8<fF)xQL@^ujdF3wJ8o@)`#3c8XgTGwqbZt
z+rqidb3G($<h;U2fcNjUQh(~CmJqf%d-xxts&gUqtye{Ow9{||AEC(7wP(*JD0?*6
zE+wi_ayN>gX^hfJo0IgoCQH<`k10sjXW75~B8vIrgN;&_&twq^Uij>l>?qFyqZ}}j
z^=LXOlTs7Oyo_WcEQF2K0T^9m-p`9GrzE+{PR9zCG>>%NQ2A|rg{ZwL?JO9*^|$rP
z9tg}um>xg$Y4fkcI(X%=v`B6w#zTyZG^Pyu>b@{o6?YpLd4?*HzBQmIDB5e-Tm7o4
zUw*qzXz7h+(2kPnCtFvqE>f4zI}9k!7BaUB4ms~x4BYH|WZC$m2@gw~UZZIHa_I>n
z$sKJnA-@exZEE*+MZ$<hsg@OT?-3{zDr6Q^BI$k-gyJ=ay~zGZD|G>vm04){+L}_|
z9X2Ef(7u@^KHr$gTSjGm=MmCI;uqvy>L)})hG)kfpW$6o(}$v8R<aITOIEN57KMzx
zZRG}|gsPHV<rbW~)DJ56JzlSgI3H-^-$m8ip=Knog)A8ExNQDVIA%4+SxXXuhbvy9
ztPHEPL<cHdH9hTVlnx2O`rt)3k&q|I5?P}lC%jP!Uh~n$^t7iL%L;pON<FVIbgCp}
zZTYrO`_B1~ozpM`Og=g}Xxx=$^VBf4iokeT+F@R+Yde5A4r)@11H#kB04%IL;wmZB
zSKU0O3MKQ_GIa<ca85%BI&7Er3=yqrzGFzIE;_x55@aE75;+O$jjZt>!j3VjZy;e;
zKeQ-X8ZKFz4Dz)kXf9~mUFsGX=WF3BCl&Kg<=VQDT7J3v-jCC387%hQaE|%BCo?50
zReq{McU6I+Sf@U8r<#`pi*K~7VAHNQAd?IfBf$XUvy37KG6<56&(`K%e-&*ABH8;E
ziE!+XA(UMd`rlryUO<vJ$7fF);eSMQLGqS0^j9E2m_8O{0LgmZcR9i5hgH&|klHg$
zCv{;iK_mu$1yFr=B$~Q%j<4lf#%E@wuHHFB-OSUOB?Z+oj@}xHrq2si*l;6z2HZ4Q
zxry4(+bL>uQgC{&l@;L5*vj&8f%dY`HH2SRaZUO1l;0jAfbnU9NQhj7m!`Uu*rcU*
zfsDYU0FoGiVy!MXOR3j0fXBdHU;uF(ajA)2NVs+Nr9D=MDhFn>_C-)|TWt@2U?@0J
zC|XiaaNOp_@!9GkxMV+kc0I1``s`B-y!m{EC&#Y+9jqo&qAaAfo9F<3S8zb0Ht!Vd
z_Ld@Ua7I<6<MkdJ@}S}Nb~z>ZAS2n&7h9G%0pI5(mGo*=6WBO?QQ_`;ORV2{Cjz&>
z&Z|r7tjON)lq6=3Y>4w?him$9n+EgaWhAD7U4flUn0kAQ5<*yf^6ilqQ)?BTqUN`^
zbs0yynRSg=)4O(J&~P>$^d8&Ya=)Y*&-Xp9t7n+-Q|k{^W2z55Hm1S$OiB5QpbH@L
z3qk#dw`0`7{rY|kxBvQv%$N6Lj9!o-LzZ@5c&2M)h~vD!FpBbh1P>(tFSCvX16KN>
zi~s-tFi=cXMVQv50096J6Bbhk7B~<}b_5<HB{54JYorV<*#tLfAdf&kQd(1QXliG&
zwX*&H{QUrz!T<mO32;bRa{vG?BLDy{BLR4&KXw2B00(qQO+^Rf3l9`AEP)uZjsO4x
zF-b&0R7l6I)iG-uF%$q`U-y8Y9IGL>M55eshT@j|fIy&AhooHSSPA?ns7tyWbSQKv
z9QYS>?NaDw4@cqM;;cUC*eMNU$sW3zRA<vt5<O+9rUQMv_fC3}dcFTW03be}q0^e5
zPy9SJ%RLr|42jxy&IZs5z_knNvp{H_HVfc@Fk0)Zo$)1jFj_Rrehhq%fyC(1jfw-U
zRYN>b{x9-Kk%<QXn|y{|QiD)b^Pra+kTi>JW{p&<2uM<@t%;-nM9j(X0VG;ISAy+_
z)UN_%jx3*nYVC+^m_+)8MC5@mzD6Tw%^3qE`lgp?nlq+KX|gVaaWxB&JW!5!@Qu(y
z417ol74l#L6_MdUk{L6srZi&#s-xk{$^$p&KvBSyWCTp^1xG^{0ahWLU>*e%6h6Wm
z4hX9idC-QpQ)rnJMZn;Rw2sJvWKs;CO3Z7>hQ+ZCE+vdJG`{f%MO6jCw!rl;u=6nl
zl0&%xxP1`3#r^_wcpA*G0j~Do^Q#~@=vvkinrFM&Id^jX*{$*6F08`4iR%!xIsMuX
zgS;!z5i)N^(iMOx$+v!Zvk=qn;ABMez3|aQ>#rcRqh;`hNY)2acW+L+3^jg&e?}()
z8$KwCVm<%5s;W<c``X_P`zIZ!{MXL(F8EQFu<xT3;@y|>Z85$*zqKmMvP(1mS(aCq
z#f#e^9^d#7{?P-txO)HV8t$}&?#6~bdcL}jJ<kt%Tj%<oC;p#h`VBL)?TuGui^c!|
N002ovPDHLkV1l_Ha#sKV

literal 0
HcmV?d00001


From 3198599ea4bce4ac7790a744c9c659a5d49f8f1d Mon Sep 17 00:00:00 2001
From: Skeli <sesyl.schweitzer@gmail.com>
Date: Mon, 26 Apr 2021 14:42:56 -0400
Subject: [PATCH 6/9] Create 110 - Draining Kiss.txt

---
 src/tm_compatibility/110 - Draining Kiss.txt | 114 +++++++++++++++++++
 1 file changed, 114 insertions(+)
 create mode 100644 src/tm_compatibility/110 - Draining Kiss.txt

diff --git a/src/tm_compatibility/110 - Draining Kiss.txt b/src/tm_compatibility/110 - Draining Kiss.txt
new file mode 100644
index 0000000..dbb4d4a
--- /dev/null
+++ b/src/tm_compatibility/110 - Draining Kiss.txt	
@@ -0,0 +1,114 @@
+TM110: Draining Kiss
+BUTTERFREE
+PIKACHU
+PIKACHU_SURFING
+PIKACHU_FLYING
+PIKACHU_COSPLAY
+PIKACHU_LIBRE
+PIKACHU_POP_STAR
+PIKACHU_ROCK_STAR
+PIKACHU_BELLE
+PIKACHU_PHD
+PIKACHU_CAP_ORIGINAL
+PIKACHU_CAP_HOENN
+PIKACHU_CAP_SINNOH
+PIKACHU_CAP_UNOVA
+PIKACHU_CAP_KALOS
+PIKACHU_CAP_ALOLA
+PIKACHU_CAP_PARTNER
+RAICHU
+RAICHU_A
+CLEFAIRY
+CLEFABLE
+VULPIX_A
+NINETALES_A
+JIGGLYPUFF
+WIGGLYTUFF
+MR_MIME
+JYNX
+MEW
+CLEFFA
+IGGLYBUFF
+TOGEPI
+TOGETIC
+MARILL
+AZUMARILL
+SMOOCHUM
+RALTS
+KIRLIA
+GARDEVOIR
+AZURILL
+MAWILE
+GOREBYSS
+LUVDISC
+CHERUBI
+CHERRIM
+TOGEKISS
+GALLADE
+FROSLASS
+UXIE
+MESPRIT
+AZELF
+AUDINO
+VIVILLON
+VIVILLON_ARCHIPELAGO
+VIVILLON_CONTINENTAL
+VIVILLON_ELEGANT
+VIVILLON_GARDEN
+VIVILLON_HIGH_PLAINS
+VIVILLON_ICY_SNOW
+VIVILLON_JUNGLE
+VIVILLON_MARINE
+VIVILLON_MODERN
+VIVILLON_MONSOON
+VIVILLON_OCEAN
+VIVILLON_POKEBALL
+VIVILLON_POLAR
+VIVILLON_RIVER
+VIVILLON_SANDSTORM
+VIVILLON_SAVANNA
+VIVILLON_SUN
+VIVILLON_TUNDRA
+VIVILLON_FANCY
+SPRITZEE
+AROMATISSE
+SWIRLIX
+SLURPUFF
+SYLVEON
+KLEFKI
+XERNEAS
+DIANCIE
+POPPLIO
+BRIONNE
+PRIMARINA
+CUTIEFLY
+RIBOMBEE
+MORELULL
+SHIINOTIC
+BOUNSWEET
+STEENEE
+TSAREENA
+COMFEY
+MIMIKYU
+TAPU_LELE
+TAPU_FINI
+MAGEARNA
+HATENNA
+HATTREM
+HATTERENE
+IMPIDIMP
+MORGREM
+GRIMMSNARL
+MILCERY
+ALCREMIE_STRAWBERRY
+ALCREMIE_BERRY
+ALCREMIE_CLOVER
+ALCREMIE_FLOWER
+ALCREMIE_LOVE
+ALCREMIE_RIBBON
+ALCREMIE_STAR
+INDEEDEE
+INDEEDEE_FEMALE
+CALYREX
+CALYREX_ICE_RIDER
+CALYREX_SHADOW_RIDER

From 39536741e00b4987fa4c46ef47a3459c0c7545d5 Mon Sep 17 00:00:00 2001
From: Skeli <sesyl.schweitzer@gmail.com>
Date: Mon, 26 Apr 2021 14:47:00 -0400
Subject: [PATCH 7/9] Fix Saved Regional Pokedex Order

---
 src/Pokedex_Orders.c | 602 +++++++++++++++++++++++++++++++++----------
 1 file changed, 472 insertions(+), 130 deletions(-)

diff --git a/src/Pokedex_Orders.c b/src/Pokedex_Orders.c
index 4c5072f..5e4fd86 100644
--- a/src/Pokedex_Orders.c
+++ b/src/Pokedex_Orders.c
@@ -3,157 +3,498 @@
 
 const u16 gPokedexOrder_Regional[] =
 {
-	SPECIES_BULBASAUR,
-	SPECIES_IVYSAUR,
-	SPECIES_VENUSAUR,
-	SPECIES_CHARMANDER,
-	SPECIES_CHARMELEON,
-	SPECIES_CHARIZARD,
-	SPECIES_SQUIRTLE,
-	SPECIES_WARTORTLE,
-	SPECIES_BLASTOISE,
+	SPECIES_SNORUNT,
+	SPECIES_GLALIE,
+	SPECIES_FROSLASS,
+	SPECIES_VANILLITE,
+	SPECIES_VANILLISH,
+	SPECIES_VANILLUXE,
+	SPECIES_DELIBIRD,
+	SPECIES_MINIOR_SHIELD,
+	SPECIES_SNEASEL,
+	SPECIES_WEAVILE,
+	SPECIES_ZUBAT,
+	SPECIES_GOLBAT,
+	SPECIES_CROBAT,
+	SPECIES_MAKUHITA,
+	SPECIES_HARIYAMA,
+	SPECIES_SPHEAL,
+	SPECIES_SEALEO,
+	SPECIES_WALREIN,
+	SPECIES_SMOOCHUM,
+	SPECIES_JYNX,
+	SPECIES_ROGGENROLA,
+	SPECIES_BOLDORE,
+	SPECIES_GIGALITH,
+	SPECIES_SWINUB,
+	SPECIES_PILOSWINE,
+	SPECIES_MAMOSWINE,
+	SPECIES_BERGMITE,
+	SPECIES_AVALUGG,
+	SPECIES_DRILBUR,
+	SPECIES_EXCADRILL,
+	SPECIES_MAWILE,
+	SPECIES_SANDSHREW_A,
+	SPECIES_SANDSLASH_A,
+	SPECIES_STARLY,
+	SPECIES_STARAVIA,
+	SPECIES_STARAPTOR,
+	SPECIES_HOOTHOOT,
+	SPECIES_NOCTOWL,
+	SPECIES_PATRAT,
+	SPECIES_WATCHOG,
+	SPECIES_RATTATA,
+	SPECIES_RATICATE,
+	SPECIES_BUDEW,
+	SPECIES_ROSELIA,
+	SPECIES_ROSERADE,
+	SPECIES_SWABLU,
+	SPECIES_ALTARIA,
+	SPECIES_ELECTRIKE,
+	SPECIES_MANECTRIC,
+	SPECIES_AZURILL,
+	SPECIES_MARILL,
+	SPECIES_AZUMARILL,
+	SPECIES_STUFFUL,
+	SPECIES_BEWEAR,
+	SPECIES_SCRAGGY,
+	SPECIES_SCRAFTY,
+	SPECIES_RIOLU,
+	SPECIES_LUCARIO,
+	SPECIES_POOCHYENA,
+	SPECIES_MIGHTYENA,
+	SPECIES_WINGULL,
+	SPECIES_PELIPPER,
+	SPECIES_SENTRET,
+	SPECIES_FURRET,
+	SPECIES_BIDOOF,
+	SPECIES_BIBAREL,
+	SPECIES_BUIZEL,
+	SPECIES_FLOATZEL,
+	SPECIES_SHELLOS,
+	SPECIES_GASTRODON,
+	SPECIES_DEWPIDER,
+	SPECIES_ARAQUANID,
+	SPECIES_SURSKIT,
+	SPECIES_MASQUERAIN,
+	SPECIES_KRABBY,
+	SPECIES_KINGLER,
+	SPECIES_SANDYGAST,
+	SPECIES_PALOSSAND,
+	SPECIES_BURMY,
+	SPECIES_WORMADAM,
+	SPECIES_MOTHIM,
+	SPECIES_FLABEBE,
+	SPECIES_FLOETTE,
+	SPECIES_FLORGES,
+	SPECIES_CUTIEFLY,
+	SPECIES_RIBOMBEE,
+	SPECIES_ORICORIO,
+	SPECIES_PANSAGE,
+	SPECIES_SIMISAGE,
+	SPECIES_PANSEAR,
+	SPECIES_SIMISEAR,
+	SPECIES_PANPOUR,
+	SPECIES_SIMIPOUR,
+	SPECIES_COMBEE,
+	SPECIES_VESPIQUEN,
+	SPECIES_COMFEY,
+	SPECIES_CHERUBI,
+	SPECIES_CHERRIM,
 	SPECIES_CATERPIE,
 	SPECIES_METAPOD,
 	SPECIES_BUTTERFREE,
 	SPECIES_WEEDLE,
 	SPECIES_KAKUNA,
 	SPECIES_BEEDRILL,
-	SPECIES_PIDGEY,
-	SPECIES_PIDGEOTTO,
-	SPECIES_PIDGEOT,
-	SPECIES_RATTATA,
-	SPECIES_RATICATE,
-	SPECIES_SPEAROW,
-	SPECIES_FEAROW,
-	SPECIES_EKANS,
-	SPECIES_ARBOK,
-	SPECIES_PIKACHU,
-	SPECIES_RAICHU,
-	SPECIES_SANDSHREW,
-	SPECIES_SANDSLASH,
-	SPECIES_NIDORAN_F,
-	SPECIES_NIDORINA,
-	SPECIES_NIDOQUEEN,
-	SPECIES_NIDORAN_M,
-	SPECIES_NIDORINO,
-	SPECIES_NIDOKING,
-	SPECIES_CLEFAIRY,
-	SPECIES_CLEFABLE,
-	SPECIES_VULPIX,
-	SPECIES_NINETALES,
-	SPECIES_JIGGLYPUFF,
-	SPECIES_WIGGLYTUFF,
-	SPECIES_ZUBAT,
-	SPECIES_GOLBAT,
-	SPECIES_ODDISH,
-	SPECIES_GLOOM,
-	SPECIES_VILEPLUME,
-	SPECIES_PARAS,
-	SPECIES_PARASECT,
-	SPECIES_VENONAT,
-	SPECIES_VENOMOTH,
-	SPECIES_DIGLETT,
-	SPECIES_DUGTRIO,
-	SPECIES_MEOWTH,
-	SPECIES_PERSIAN,
-	SPECIES_PSYDUCK,
-	SPECIES_GOLDUCK,
-	SPECIES_MANKEY,
-	SPECIES_PRIMEAPE,
-	SPECIES_GROWLITHE,
-	SPECIES_ARCANINE,
-	SPECIES_POLIWAG,
-	SPECIES_POLIWHIRL,
-	SPECIES_POLIWRATH,
-	SPECIES_ABRA,
-	SPECIES_KADABRA,
-	SPECIES_ALAKAZAM,
-	SPECIES_MACHOP,
-	SPECIES_MACHOKE,
-	SPECIES_MACHAMP,
-	SPECIES_BELLSPROUT,
-	SPECIES_WEEPINBELL,
-	SPECIES_VICTREEBEL,
-	SPECIES_TENTACOOL,
-	SPECIES_TENTACRUEL,
-	SPECIES_GEODUDE,
-	SPECIES_GRAVELER,
-	SPECIES_GOLEM,
-	SPECIES_PONYTA,
-	SPECIES_RAPIDASH,
-	SPECIES_SLOWPOKE,
-	SPECIES_SLOWBRO,
-	SPECIES_MAGNEMITE,
-	SPECIES_MAGNETON,
-	SPECIES_FARFETCHD,
-	SPECIES_DODUO,
-	SPECIES_DODRIO,
-	SPECIES_SEEL,
-	SPECIES_DEWGONG,
-	SPECIES_GRIMER,
-	SPECIES_MUK,
-	SPECIES_SHELLDER,
-	SPECIES_CLOYSTER,
+	SPECIES_SEEDOT,
+	SPECIES_NUZLEAF,
+	SPECIES_SHIFTRY,
+	SPECIES_PUMPKABOO,
+	SPECIES_GOURGEIST,
 	SPECIES_GASTLY,
 	SPECIES_HAUNTER,
 	SPECIES_GENGAR,
-	SPECIES_ONIX,
+	SPECIES_SHUPPET,
+	SPECIES_BANETTE,
+	SPECIES_DUSKULL,
+	SPECIES_DUSCLOPS,
+	SPECIES_DUSKNOIR,
+	SPECIES_PHANTUMP,
+	SPECIES_TREVENANT,
+	SPECIES_NINCADA,
+	SPECIES_NINJASK,
+	SPECIES_SHEDINJA,
+	SPECIES_PIKIPEK,
+	SPECIES_TRUMBEAK,
+	SPECIES_TOUCANNON,
+	SPECIES_LILLIPUP,
+	SPECIES_HERDIER,
+	SPECIES_STOUTLAND,
+	SPECIES_EKANS,
+	SPECIES_ARBOK,
+	SPECIES_NUMEL,
+	SPECIES_CAMERUPT,
+	SPECIES_MANKEY,
+	SPECIES_PRIMEAPE,
+	SPECIES_RALTS,
+	SPECIES_KIRLIA,
+	SPECIES_GARDEVOIR,
+	SPECIES_GALLADE,
+	SPECIES_LITLEO,
+	SPECIES_PYROAR,
+	SPECIES_WOOBAT,
+	SPECIES_SWOOBAT,
+	SPECIES_SLUGMA,
+	SPECIES_MAGCARGO,
+	SPECIES_SALANDIT,
+	SPECIES_SALAZZLE,
+	SPECIES_GEODUDE,
+	SPECIES_GRAVELER,
+	SPECIES_GOLEM,
+	SPECIES_TORKOAL,
+	SPECIES_MAGBY,
+	SPECIES_MAGMAR,
+	SPECIES_MAGMORTAR,
+	SPECIES_HEATMOR,
+	SPECIES_VULPIX,
+	SPECIES_NINETALES,
+	SPECIES_TAILLOW,
+	SPECIES_SWELLOW,
+	SPECIES_MURKROW,
+	SPECIES_HONCHKROW,
+	SPECIES_BUNNELBY,
+	SPECIES_DIGGERSBY,
+	SPECIES_NIDORAN_M,
+	SPECIES_NIDORINO,
+	SPECIES_NIDOKING,
+	SPECIES_NIDORAN_F,
+	SPECIES_NIDORINA,
+	SPECIES_NIDOQUEEN,
+	SPECIES_GROWLITHE,
+	SPECIES_ARCANINE,
+	SPECIES_HOUNDOUR,
+	SPECIES_HOUNDOOM,
+	SPECIES_DEDENNE,
+	SPECIES_PURRLOIN,
+	SPECIES_LIEPARD,
+	SPECIES_ARON,
+	SPECIES_LAIRON,
+	SPECIES_AGGRON,
+	SPECIES_NOSEPASS,
+	SPECIES_PROBOPASS,
+	SPECIES_NOIBAT,
+	SPECIES_NOIVERN,
+	SPECIES_PHANPY,
+	SPECIES_DONPHAN,
+	SPECIES_GLIGAR,
+	SPECIES_GLISCOR,
+	SPECIES_DUNSPARCE,
+	SPECIES_ZIGZAGOON,
+	SPECIES_LINOONE,
+	SPECIES_LEDYBA,
+	SPECIES_LEDIAN,
+	SPECIES_SPINARAK,
+	SPECIES_ARIADOS,
+	SPECIES_SHINX,
+	SPECIES_LUXIO,
+	SPECIES_LUXRAY,
+	SPECIES_DEERLING,
+	SPECIES_SAWSBUCK,
+	SPECIES_SUNKERN,
+	SPECIES_SUNFLORA,
+	SPECIES_KRICKETOT,
+	SPECIES_KRICKETUNE,
+	SPECIES_SMEARGLE,
+	SPECIES_YUNGOOS,
+	SPECIES_GUMSHOOS,
+	SPECIES_DODUO,
+	SPECIES_DODRIO,
+	SPECIES_BUNEARY,
+	SPECIES_LOPUNNY,
+	SPECIES_ABRA,
+	SPECIES_KADABRA,
+	SPECIES_ALAKAZAM,
+	SPECIES_MAREEP,
+	SPECIES_FLAAFFY,
+	SPECIES_AMPHAROS,
+	SPECIES_ESPURR,
+	SPECIES_MEOWSTIC,
 	SPECIES_DROWZEE,
 	SPECIES_HYPNO,
-	SPECIES_KRABBY,
-	SPECIES_KINGLER,
-	SPECIES_VOLTORB,
-	SPECIES_ELECTRODE,
-	SPECIES_EXEGGCUTE,
-	SPECIES_EXEGGUTOR,
-	SPECIES_CUBONE,
-	SPECIES_MAROWAK,
-	SPECIES_HITMONLEE,
-	SPECIES_HITMONCHAN,
-	SPECIES_LICKITUNG,
-	SPECIES_KOFFING,
-	SPECIES_WEEZING,
-	SPECIES_RHYHORN,
-	SPECIES_RHYDON,
-	SPECIES_CHANSEY,
-	SPECIES_TANGELA,
-	SPECIES_KANGASKHAN,
-	SPECIES_HORSEA,
-	SPECIES_SEADRA,
-	SPECIES_GOLDEEN,
-	SPECIES_SEAKING,
-	SPECIES_STARYU,
-	SPECIES_STARMIE,
+	SPECIES_MIME_JR,
 	SPECIES_MR_MIME,
-	SPECIES_SCYTHER,
-	SPECIES_JYNX,
-	SPECIES_ELECTABUZZ,
-	SPECIES_MAGMAR,
-	SPECIES_PINSIR,
-	SPECIES_TAUROS,
 	SPECIES_MAGIKARP,
 	SPECIES_GYARADOS,
-	SPECIES_LAPRAS,
-	SPECIES_DITTO,
+	SPECIES_BRONZOR,
+	SPECIES_BRONZONG,
+	SPECIES_ONIX,
+	SPECIES_STEELIX,
+	SPECIES_CRYOGONAL,
+	SPECIES_CARBINK,
+	SPECIES_SNOVER,
+	SPECIES_ABOMASNOW,
+	SPECIES_CUBCHOO,
+	SPECIES_BEARTIC,
+	SPECIES_STANTLER,
+	SPECIES_CRABRAWLER,
+	SPECIES_CRABOMINABLE,
+	SPECIES_SPEAROW,
+	SPECIES_FEAROW,
+	SPECIES_GRUBBIN,
+	SPECIES_CHARJABUG,
+	SPECIES_VIKAVOLT,
+	SPECIES_SHROOMISH,
+	SPECIES_BRELOOM,
+	SPECIES_SKORUPI,
+	SPECIES_DRAPION,
+	SPECIES_HAPPINY,
+	SPECIES_CHANSEY,
+	SPECIES_BLISSEY,
+	SPECIES_KARRABLAST,
+	SPECIES_ESCAVALIER,
+	SPECIES_LOTAD,
+	SPECIES_LOMBRE,
+	SPECIES_LUDICOLO,
+	SPECIES_TYMPOLE,
+	SPECIES_PALPITOAD,
+	SPECIES_SEISMITOAD,
+	SPECIES_MILTANK,
+	SPECIES_LICKITUNG,
+	SPECIES_GOOMY,
+	SPECIES_SLIGGOO,
+	SPECIES_GOODRA,
+	SPECIES_SHELMET,
+	SPECIES_ACCELGOR,
+	SPECIES_EXEGGCUTE,
+	SPECIES_EXEGGUTOR,
+	SPECIES_MEOWTH,
+	SPECIES_PERSIAN,
+	SPECIES_YANMA,
+	SPECIES_YANMEGA,
+	SPECIES_VENONAT,
+	SPECIES_VENOMOTH,
+	SPECIES_SPOINK,
+	SPECIES_GRUMPIG,
+	SPECIES_MEDITITE,
+	SPECIES_MEDICHAM,
+	SPECIES_ABSOL,
+	SPECIES_GLAMEOW,
+	SPECIES_PURUGLY,
+	SPECIES_SEEL,
+	SPECIES_DEWGONG,
+	SPECIES_SHELLDER,
+	SPECIES_CLOYSTER,
+	SPECIES_STARYU,
+	SPECIES_STARMIE,
+	SPECIES_CORPHISH,
+	SPECIES_CRAWDAUNT,
+	SPECIES_GOLDEEN,
+	SPECIES_SEAKING,
+	SPECIES_REMORAID,
+	SPECIES_OCTILLERY,
+	SPECIES_WISHIWASHI,
+	SPECIES_CARVANHA,
+	SPECIES_SHARPEDO,
+	SPECIES_LUVDISC,
+	SPECIES_BARBOACH,
+	SPECIES_WHISCASH,
+	SPECIES_MAGNEMITE,
+	SPECIES_MAGNETON,
+	SPECIES_MAGNEZONE,
+	SPECIES_CUBONE,
+	SPECIES_MAROWAK,
+	SPECIES_KLINK,
+	SPECIES_KLANG,
+	SPECIES_KLINKLANG,
+	SPECIES_ELEKID,
+	SPECIES_ELECTABUZZ,
+	SPECIES_ELECTIVIRE,
+	SPECIES_TYNAMO,
+	SPECIES_EELEKTRIK,
+	SPECIES_EELEKTROSS,
+	SPECIES_TIMBURR,
+	SPECIES_GURDURR,
+	SPECIES_CONKELDURR,
+	SPECIES_JOLTIK,
+	SPECIES_GALVANTULA,
+	SPECIES_FERROSEED,
+	SPECIES_FERROTHORN,
+	SPECIES_CHINCHOU,
+	SPECIES_LANTURN,
+	SPECIES_MACHOP,
+	SPECIES_MACHOKE,
+	SPECIES_MACHAMP,
+	SPECIES_WOOPER,
+	SPECIES_QUAGSIRE,
+	SPECIES_MISDREAVUS,
+	SPECIES_MISMAGIUS,
+	SPECIES_POLIWAG,
+	SPECIES_POLIWHIRL,
+	SPECIES_POLITOED,
+	SPECIES_PSYDUCK,
+	SPECIES_GOLDUCK,
+	SPECIES_FLETCHLING,
+	SPECIES_FLETCHINDER,
+	SPECIES_TALONFLAME,
+	SPECIES_ROCKRUFF,
+	SPECIES_LYCANROC,
+	SPECIES_INKAY,
+	SPECIES_MALAMAR,
+	SPECIES_PONYTA,
+	SPECIES_RAPIDASH,
+	SPECIES_SNUBBULL,
+	SPECIES_GRANBULL,
+	SPECIES_MIENFOO,
+	SPECIES_MIENSHAO,
+	SPECIES_TOGEDEMARU,
+	SPECIES_SWIRLIX,
+	SPECIES_SLURPUFF,
+	SPECIES_SPRITZEE,
+	SPECIES_AROMATISSE,
+	SPECIES_WAILMER,
+	SPECIES_WAILORD,
 	SPECIES_EEVEE,
 	SPECIES_VAPOREON,
 	SPECIES_JOLTEON,
 	SPECIES_FLAREON,
-	SPECIES_PORYGON,
-	SPECIES_OMANYTE,
-	SPECIES_OMASTAR,
-	SPECIES_KABUTO,
-	SPECIES_KABUTOPS,
-	SPECIES_AERODACTYL,
-	SPECIES_SNORLAX,
-	SPECIES_ARTICUNO,
-	SPECIES_ZAPDOS,	
-	SPECIES_MOLTRES,
+	SPECIES_ESPEON,
+	SPECIES_UMBREON,
+	SPECIES_LEAFEON,
+	SPECIES_GLACEON,
+	SPECIES_SYLVEON,
 	SPECIES_DRATINI,
 	SPECIES_DRAGONAIR,
 	SPECIES_DRAGONITE,
-	SPECIES_MEWTWO,
-	SPECIES_MEW,
+	SPECIES_PORYGON,
+	SPECIES_PORYGON2,
+	SPECIES_PORYGON_Z,
+	SPECIES_EMOLGA,
+	SPECIES_HAWLUCHA,
+	SPECIES_KLEFKI,
+	SPECIES_GOLETT,
+	SPECIES_GOLURK,
+	SPECIES_CHINGLING,
+	SPECIES_CHIMECHO,
+	SPECIES_HORSEA,
+	SPECIES_SEADRA,
+	SPECIES_KINGDRA,
+	SPECIES_BALTOY,
+	SPECIES_CLAYDOL,
+	SPECIES_YAMASK,
+	SPECIES_COFAGRIGUS,
+	SPECIES_SABLEYE,
+	SPECIES_LUNATONE,
+	SPECIES_SOLROCK,
+	SPECIES_SIGILYPH,
+	SPECIES_TENTACOOL,
+	SPECIES_TENTACRUEL,
+	SPECIES_LAPRAS,
+	SPECIES_BASCULIN_RED,
+	SPECIES_MANTYKE,
+	SPECIES_MANTINE,
+	SPECIES_PYUKUMUKU,
+	SPECIES_FINNEON,
+	SPECIES_LUMINEON,
+	SPECIES_STUNFISK,
+	SPECIES_ALOMOMOLA,
+	SPECIES_SKRELP,
+	SPECIES_DRAGALGE,
+	SPECIES_CLAUNCHER,
+	SPECIES_CLAWITZER,
+	SPECIES_SLOWPOKE,
+	SPECIES_SLOWBRO,
+	SPECIES_SLOWKING,
+	SPECIES_BELLSPROUT,
+	SPECIES_WEEPINBELL,
+	SPECIES_VICTREEBEL,
+	SPECIES_ODDISH,
+	SPECIES_GLOOM,
+	SPECIES_VILEPLUME,
+	SPECIES_BELLOSSOM,
+	SPECIES_DWEBBLE,
+	SPECIES_CRUSTLE,
+	SPECIES_SANDILE,
+	SPECIES_KROKOROK,
+	SPECIES_KROOKODILE,
+	SPECIES_CACNEA,
+	SPECIES_CACTURNE,
+	SPECIES_DARUMAKA,
+	SPECIES_DARMANITAN,
+	SPECIES_HIPPOPOTAS,
+	SPECIES_HIPPOWDON,
+	SPECIES_TRAPINCH,
+	SPECIES_VIBRAVA,
+	SPECIES_FLYGON,
+	SPECIES_MARACTUS,
+	SPECIES_WURMPLE,
+	SPECIES_SILCOON,
+	SPECIES_BEAUTIFLY,
+	SPECIES_CASCOON,
+	SPECIES_DUSTOX,
+	SPECIES_SCATTERBUG,
+	SPECIES_SPEWPA,
+	SPECIES_VIVILLON,
+	SPECIES_COTTONEE,
+	SPECIES_WHIMSICOTT,
+	SPECIES_PETILIL,
+	SPECIES_LILLIGANT,
+	SPECIES_FOONGUS,
+	SPECIES_PARAS,
+	SPECIES_PARASECT,
+	SPECIES_AMOONGUSS,
+	SPECIES_MORELULL,
+	SPECIES_SHIINOTIC,
+	SPECIES_PICHU,
+	SPECIES_PIKACHU,
+	SPECIES_RAICHU,
+	SPECIES_TANGELA,
+	SPECIES_TANGROWTH,
+	SPECIES_GIRAFARIG,
+	SPECIES_PANCHAM,
+	SPECIES_PANGORO,
+	SPECIES_PAWNIARD,
+	SPECIES_BISHARP,
+	SPECIES_CHATOT,
+	SPECIES_THROH,
+	SPECIES_SAWK,
+	SPECIES_GOTHITA,
+	SPECIES_GOTHORITA,
+	SPECIES_GOTHITELLE,
+	SPECIES_SOLOSIS,
+	SPECIES_DUOSION,
+	SPECIES_REUNICLUS,
+	SPECIES_GRIMER,
+	SPECIES_MUK,
+	SPECIES_KOFFING,
+	SPECIES_WEEZING,
+	SPECIES_HOPPIP,
+	SPECIES_SKIPLOOM,
+	SPECIES_JUMPLUFF,
+	SPECIES_TROPIUS,
+	SPECIES_FARFETCHD,
+	SPECIES_ZANGOOSE,
+	SPECIES_SEVIPER,
+	SPECIES_BAGON,
+	SPECIES_SHELGON,
+	SPECIES_SALAMENCE,
+	SPECIES_VOLBEAT,
+	SPECIES_ILLUMISE,
+	SPECIES_ARTICUNO,
+	SPECIES_ZAPDOS,
+	SPECIES_MOLTRES,
+	SPECIES_REGIROCK,
+	SPECIES_REGICE,
+	SPECIES_REGISTEEL,
+	SPECIES_REGIGIGAS,
+	SPECIES_KYOGRE,
+	SPECIES_GROUDON,
+	SPECIES_RAYQUAZA,
+	SPECIES_HEATRAN,
+	SPECIES_SHAYMIN,
+	SPECIES_MAGEARNA,
+	SPECIES_ZERAORA,
+	SPECIES_HOOPA,
 };
 
 const u16 gRegionalDexCount = ARRAY_COUNT(gPokedexOrder_Regional);
@@ -703,6 +1044,7 @@ const u16 gPokedexOrder_Alphabetical[] =
 	SPECIES_OMASTAR,
 	SPECIES_ONIX,
 	SPECIES_ORANGURU,
+	SPECIES_ORBEETLE,
 	SPECIES_ORICORIO,
 	SPECIES_OSHAWOTT,
 	SPECIES_PACHIRISU,

From 366a7cdb463b9a46a023ad9e9e0493e698dbd339 Mon Sep 17 00:00:00 2001
From: Skeli <sesyl.schweitzer@gmail.com>
Date: Mon, 26 Apr 2021 14:47:13 -0400
Subject: [PATCH 8/9] Update Evolutions

---
 src/Evolution Table.c | 37 +++++++++++++++++++++----------------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/src/Evolution Table.c b/src/Evolution Table.c
index 7dafd1a..f7d8f83 100644
--- a/src/Evolution Table.c	
+++ b/src/Evolution Table.c	
@@ -81,7 +81,8 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] =
 								  {EVO_ITEM, ITEM_KINGS_ROCK, SPECIES_SLOWKING, 0}},
 	[SPECIES_SLOWBRO] =          {{EVO_MEGA, ITEM_SLOWBRONITE, SPECIES_SLOWBRO_MEGA, MEGA_VARIANT_STANDARD}},
 	[SPECIES_MAGNEMITE] =        {{EVO_LEVEL, 30, SPECIES_MAGNETON, 0}},
-	[SPECIES_MAGNETON] =         {{EVO_MAP, MAP_NAME_THUNDERCAP_MT, SPECIES_MAGNEZONE, 0}},
+	[SPECIES_MAGNETON] =         {{EVO_MAP, MAPSEC_THUNDERCAP_MOUNTAIN, SPECIES_MAGNEZONE, 0},
+								  {EVO_ITEM, ITEM_THUNDER_STONE, SPECIES_MAGNEZONE, 0}},
 	[SPECIES_DODUO] =            {{EVO_LEVEL, 31, SPECIES_DODRIO, 0}},
 	[SPECIES_SEEL] =             {{EVO_LEVEL, 34, SPECIES_DEWGONG, 0}},
 	[SPECIES_GRIMER] =           {{EVO_LEVEL, 38, SPECIES_MUK, 0}},
@@ -121,16 +122,16 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] =
 	[SPECIES_PINSIR] =           {{EVO_MEGA, ITEM_PINSIRITE, SPECIES_PINSIR_MEGA, MEGA_VARIANT_STANDARD}},
 	[SPECIES_MAGIKARP] =         {{EVO_LEVEL, 20, SPECIES_GYARADOS, 0}},
 	[SPECIES_GYARADOS] =         {{EVO_MEGA, ITEM_GYARADOSITE, SPECIES_GYARADOS_MEGA, MEGA_VARIANT_STANDARD}},
-//	[SPECIES_LAPRAS] =           {{EVO_GIGANTAMAX, TRUE, SPECIES_LAPRAS_GIGA, 0}},
-	[SPECIES_EEVEE] =            {{EVO_FRIENDSHIP_DAY, 0, SPECIES_ESPEON, 0},
+	[SPECIES_LAPRAS] =           {{EVO_GIGANTAMAX, TRUE, SPECIES_LAPRAS_GIGA, 0}},
+	[SPECIES_EEVEE] =            {{EVO_MOVE_TYPE, TYPE_FAIRY, SPECIES_SYLVEON, 0}, //Overriden by Espeon and Umbrean if need be
+								  {EVO_FRIENDSHIP_DAY, 0, SPECIES_ESPEON, 0},
 								  {EVO_FRIENDSHIP_NIGHT, 0, SPECIES_UMBREON, 0},
 								  {EVO_ITEM, ITEM_FIRE_STONE, SPECIES_FLAREON, 0},
 								  {EVO_ITEM, ITEM_THUNDER_STONE, SPECIES_JOLTEON, 0},
 								  {EVO_ITEM, ITEM_WATER_STONE, SPECIES_VAPOREON, 0},
 								  {EVO_ITEM, ITEM_LEAF_STONE, SPECIES_LEAFEON, 0},
 								  {EVO_ITEM, ITEM_ICE_STONE, SPECIES_GLACEON, 0},
-								  {EVO_MOVE_TYPE, TYPE_FAIRY, SPECIES_SYLVEON, 0}/*,
-								  {EVO_GIGANTAMAX, TRUE, SPECIES_EEVEE_GIGA, 0}*/},
+								  {EVO_GIGANTAMAX, TRUE, SPECIES_EEVEE_GIGA, 0}},
 	[SPECIES_PORYGON] =          {{EVO_ITEM, ITEM_UP_GRADE, SPECIES_PORYGON2, 0},
 								  {EVO_TRADE_ITEM, ITEM_UP_GRADE, SPECIES_PORYGON2, 0}},
 	[SPECIES_OMANYTE] =          {{EVO_LEVEL, 40, SPECIES_OMASTAR, 0}},
@@ -224,11 +225,12 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] =
 	[SPECIES_WAILMER] =          {{EVO_LEVEL, 40, SPECIES_WAILORD, 0}},
 	[SPECIES_SKITTY] =           {{EVO_ITEM, ITEM_MOON_STONE, SPECIES_DELCATTY, 0}},
 	[SPECIES_BALTOY] =           {{EVO_LEVEL, 36, SPECIES_CLAYDOL, 0}},
-	[SPECIES_NOSEPASS] =         {{EVO_MAP, MAP_NAME_THUNDERCAP_MT, SPECIES_PROBOPASS, 0}},
+	[SPECIES_NOSEPASS] =         {{EVO_MAP, MAPSEC_THUNDERCAP_MOUNTAIN, SPECIES_PROBOPASS, 0},
+								  {EVO_ITEM, ITEM_THUNDER_STONE, SPECIES_PROBOPASS, 0}},
 	[SPECIES_SABLEYE] =          {{EVO_MEGA, ITEM_SABLENITE, SPECIES_SABLEYE_MEGA, MEGA_VARIANT_STANDARD}},
 	[SPECIES_BARBOACH] =         {{EVO_LEVEL, 30, SPECIES_WHISCASH, 0}},
 	[SPECIES_CORPHISH] =         {{EVO_LEVEL, 30, SPECIES_CRAWDAUNT, 0}},
-	[SPECIES_FEEBAS] =           {{EVO_BEAUTY, 0, SPECIES_MILOTIC, 0},
+	[SPECIES_FEEBAS] =           {/*{EVO_BEAUTY, 0, SPECIES_MILOTIC, 0},*/
 								  {EVO_ITEM, ITEM_PRISM_SCALE, SPECIES_MILOTIC, 0},
 								  {EVO_TRADE_ITEM, ITEM_PRISM_SCALE, SPECIES_MILOTIC, 0}},
 	[SPECIES_CARVANHA] =         {{EVO_LEVEL, 30, SPECIES_SHARPEDO, 0}},
@@ -310,7 +312,7 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] =
 	[SPECIES_COMBEE] =           {{EVO_FEMALE_LEVEL, 21, SPECIES_VESPIQUEN, 0}},
 	[SPECIES_BUIZEL] =           {{EVO_LEVEL, 26, SPECIES_FLOATZEL, 0}},
 	[SPECIES_CHERUBI] =          {{EVO_LEVEL, 25, SPECIES_CHERRIM, 0}},
-	[SPECIES_SHELLOS] =          {{EVO_LEVEL, 32, SPECIES_GASTRODON, 0}},
+	[SPECIES_SHELLOS] =          {{EVO_LEVEL, 30, SPECIES_GASTRODON, 0}},
 	[SPECIES_DRIFLOON] =         {{EVO_LEVEL, 28, SPECIES_DRIFBLIM, 0}},
 	[SPECIES_BUNEARY] =          {{EVO_FRIENDSHIP, 0, SPECIES_LOPUNNY, 0}},
 	[SPECIES_LOPUNNY] =          {{EVO_MEGA, ITEM_LOPUNNITE, SPECIES_LOPUNNY_MEGA, MEGA_VARIANT_STANDARD}},
@@ -420,7 +422,7 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] =
 								  {EVO_MALE_LEVEL, 20, SPECIES_MOTHIM, 0}},
 	[SPECIES_BURMY_TRASH] =      {{EVO_FEMALE_LEVEL, 20, SPECIES_WORMADAM_TRASH, 0},
 								  {EVO_MALE_LEVEL, 20, SPECIES_MOTHIM, 0}},
-	[SPECIES_SHELLOS_EAST] =     {{EVO_LEVEL, 32, SPECIES_GASTRODON_EAST, 0}},
+	[SPECIES_SHELLOS_EAST] =     {{EVO_LEVEL, 30, SPECIES_GASTRODON_EAST, 0}},
 	[SPECIES_DEERLING_SUMMER] =  {{EVO_LEVEL, 34, SPECIES_SAWSBUCK_SUMMER, 0}},
 	[SPECIES_DEERLING_AUTUMN] =  {{EVO_LEVEL, 34, SPECIES_SAWSBUCK_AUTUMN, 0}},
 	[SPECIES_DEERLING_WINTER] =  {{EVO_LEVEL, 34, SPECIES_SAWSBUCK_WINTER, 0}},
@@ -539,14 +541,17 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] =
 	[SPECIES_TRUMBEAK] =         {{EVO_LEVEL, 28, SPECIES_TOUCANNON, 0}},
 	[SPECIES_YUNGOOS] =          {{EVO_LEVEL_DAY, 20, SPECIES_GUMSHOOS, 0}},
 	[SPECIES_GRUBBIN] =          {{EVO_LEVEL, 20, SPECIES_CHARJABUG, 0}},
-	[SPECIES_CHARJABUG] =        {{EVO_MAP, MAP_NAME_THUNDERCAP_MT, SPECIES_VIKAVOLT, 0}},
-	[SPECIES_CRABRAWLER] =       {{EVO_MAP, MAP_NAME_FROST_MOUNTAIN, SPECIES_CRABOMINABLE, 0},
-								  {EVO_MAP, MAP_NAME_ROUTE_8, SPECIES_NONE, 0},
-								  {EVO_MAP, MAP_NAME_BLIZZARD_CITY, SPECIES_NONE, 0}},
+	[SPECIES_CHARJABUG] =        {{EVO_MAP, MAPSEC_THUNDERCAP_MOUNTAIN, SPECIES_VIKAVOLT, 0},
+								  {EVO_ITEM, ITEM_THUNDER_STONE, SPECIES_VIKAVOLT, 0}},
+	[SPECIES_CRABRAWLER] =       {{EVO_ITEM, ITEM_ICE_STONE, SPECIES_CRABOMINABLE, 0},
+								  {EVO_MAP, MAPSEC_FROST_MOUNTAIN, SPECIES_CRABOMINABLE, 0},
+								  {EVO_MAP, MAPSEC_ROUTE_8, SPECIES_CRABOMINABLE, 0},
+								  {EVO_MAP, MAPSEC_BLIZZARD_CITY, SPECIES_CRABOMINABLE, 0},
+								  {EVO_MAP, MAPSEC_FROZEN_FOREST, SPECIES_CRABOMINABLE, 0}},
 	[SPECIES_CUTIEFLY] =         {{EVO_LEVEL, 25, SPECIES_RIBOMBEE, 0}},
-	[SPECIES_ROCKRUFF] =         {{EVO_LEVEL_SPECIFIC_TIME_RANGE, 25, SPECIES_LYCANROC_DUSK, TIME_RANGE(17, 20)}, //5 PM - 7:59 PM
-								  {EVO_LEVEL_DAY, 25, SPECIES_LYCANROC, 0},
-								  {EVO_LEVEL_NIGHT, 25, SPECIES_LYCANROC_N, 0}}, 
+	[SPECIES_ROCKRUFF] =         {{EVO_LEVEL_DAY, 25, SPECIES_LYCANROC, 0},
+								  {EVO_LEVEL_NIGHT, 25, SPECIES_LYCANROC_N, 0},
+								  {EVO_LEVEL_SPECIFIC_TIME_RANGE, 25, SPECIES_LYCANROC_DUSK, TIME_RANGE(17, 20)}}, //5 PM - 7:59 PM 
 	[SPECIES_MAREANIE] =         {{EVO_LEVEL, 38, SPECIES_TOXAPEX, 0}},
 	[SPECIES_MUDBRAY] =          {{EVO_LEVEL, 30, SPECIES_MUDSDALE, 0}},
 	[SPECIES_DEWPIDER] =         {{EVO_LEVEL, 22, SPECIES_ARAQUANID, 0}},

From 528b84cedf33c0786f74e61d1c865fca89841aea Mon Sep 17 00:00:00 2001
From: Skeli <sesyl.schweitzer@gmail.com>
Date: Mon, 26 Apr 2021 14:47:23 -0400
Subject: [PATCH 9/9] Change Num Tutor Moves

---
 src/defines.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/defines.h b/src/defines.h
index 3070581..28b0b7f 100644
--- a/src/defines.h
+++ b/src/defines.h
@@ -20,4 +20,4 @@
 //#define INCLUDE_FOOTPRINTS //If you uncomment this line, make sure to uncomment gMonFootprintTable in "repoints", and remove the footprint remover in "bytereplacement"
 
 #define NUM_TMSHMS 128
-#define NUM_MOVE_TUTOR_MOVES 128
\ No newline at end of file
+#define NUM_MOVE_TUTOR_MOVES 146