From 62414e1d71508f4e25fba402e9213f3fa79c2671 Mon Sep 17 00:00:00 2001
From: Skeli <sesyl.schweitzer@gmail.com>
Date: Fri, 31 Jul 2020 11:37:24 +0300
Subject: [PATCH] Update Shiny Garchomp Line & Various Movesets

---
 graphics/backspr/gBackShinySprite496Gible.png | Bin 589 -> 592 bytes
 .../backspr/gBackShinySprite497Gabite.png     | Bin 690 -> 691 bytes
 .../backspr/gBackShinySprite498Garchomp.png   | Bin 615 -> 615 bytes
 .../gBackShinySprite913GarchompMega.png       | Bin 642 -> 641 bytes
 src/Egg_Moves.c                               | 128 +++++--
 src/Learnsets.c                               | 312 +++++++++---------
 6 files changed, 258 insertions(+), 182 deletions(-)

diff --git a/graphics/backspr/gBackShinySprite496Gible.png b/graphics/backspr/gBackShinySprite496Gible.png
index 1ff08b9876e3742eea0f5d9c795861d75a7833b8..8e4e86f67e75946bf5a5557654a6ee33f72c3e8a 100644
GIT binary patch
delta 559
zcmV+~0?_@<1kePKEPq-60Gv4h%~Am7Y5+jc*bo>XIH<r_U|{(8_`t}}a1bcSaB%<j
z#m&W(SP%f7Yvs-W00G-cL_t(|ob8moPUAong&hj&*p`3_MdMXmP|aM+1zm_=!Ac8w
zH7FEFv6M_p#Umh~O|#qWd#%JXaPQ1G8DEF(S8$q%G@sA?@qdY<=xa%!CjYpPE7aBJ
z%yCv!m1mqC2LzBTC5{B1oVW$AqMD_E*qjx+%{l^-x<&%Vp8;}F*R`5+z&C+9U9anU
zk*NXTEu>kXOeXoD+P8UX)@x%-I{>0lO!q1ghSZMv{jt^wRRFL=n{c3U6{wROfmJm*
z45U;B0bN}25`TLDEjCNdEfP&03LK!9TV^p5Vw&0>3EMpDEzCF|raK^gU2bK6&_q}Z
z2b6I6#@~enN{}>WN!{>G63}3axK3#&K4ZWr!4~LoZKnbGi*IriHwyMDUpRod4enui
z0DyofpN2pa8r(nXAt1!w;P>OO0>+>tRLqAYfMT-qkbi?fMR!JEP`W;g*?_ncpmNi8
zK*jT7|9i?=(88)Jne<!8TvA#WT(tO69$1sJP!=x62LQClx?oCH!e`0WDBbTK&^Q2c
zJ4cB=)0;k!dcdth$1!Ump8GAE3<&{$`%BP2@sr|#6&>gAf5OK#eUtnSb2q|!Xwd}s
xklS3ShbSHpMrG=bi|epNNSye{MBn=V^Z~mdv>nJ9U>pDd002ovPDHLkV1h`h1ib(N

delta 556
zcmV+{0@MA_1kD7HEPn_nU<gov7=XY)pzuJ@*bo>XIH<r_U|{(8_`t}}a1bcSaB$$j
zD4>WCSP%eK=iS}_00G!ZL_t(|ob8moPQx%1g<A&ZCXpx;svOh|O!18}u$AT&qOQ;&
zS7ksVQt`^fBOqYy0vqpz)Mwyc+i9Jf!j9l9uH-N0{^T^h-hbbcK#hL54+_-9_sn6O
z6@_E09R~!E3?&W(o}8G2Q&vnOKy1p2&EtlEuq=^)!FND9E6Y+&IpCT=4OgqOoW-&O
zIEz%zP&!Wepvtv5)T@=&y6ynIen9s!6q-~I`2C?$Ayoh{L>+RVvK6S41cAF^v>%A5
z3<4^<;3akdT7TRx6}Jc#c}TE;TCSNzUx;yJdL-=rNv&bR0WsbJ(aUn3wg(M`v9Lf6
z=db)-7$Ap~#>}Z3zDWWqY!TO)nu(7Y&=0W%dR&=lAbsPT><5*Eo$_Z6U~av8SndJ9
zBl5>CQ27Qo52_0Yu`_so=vKfOG=vQJkOWXnwjONHq<@7L7?h^ZY|<eX0%W4=1}J!5
z%zsZ>3tCuFgrjx~u}w;CgNqiYc^fcmvKG?7*<cTV7I72Il$CH<GBtAhy9HDhfW*v^
zqtE!N4MYyGt589}S_r0Y%Q{9vz-N02>KZ>O4!EP^Wb@%auIQWOc9_@^HoisW-9ut>
uA#YoNA0?HsJ<cxu5<YR{BGdcV@6#8%AhaF2T$c6#0000<MNUMnLSTY%q5sYR

diff --git a/graphics/backspr/gBackShinySprite497Gabite.png b/graphics/backspr/gBackShinySprite497Gabite.png
index 44fd85ba821908382c3549f43ba44a6d77b1779e..ae02c50cd33303d3ccff87325917f61709482fb1 100644
GIT binary patch
delta 659
zcmV;E0&M-V1+xW^EPtFa05Lf^%}M|{ti?gq-sWlm5Evl%_!!uj7+L@T|MtcB`1sAm
zlyG=}z{t>FSe}*u00KTqL_t(|oaK}~j@vL0g#}{)wjOc;7u$HKLWPPz9we!~kZ)ig
zAU9a4VG$s0j*xb{?YCLLgmaAm3*-#BLijJ4rhS2BC(WlfkAIItRn<pccK|o*{ccaN
zyk3XH;jpLfDgi{F_x)B}BSs?X`hE-073<6hbkO%bz^VugAUe1KFmTHP{OKmJ1y#0y
z5on46Ri#E#zwi5|EMQVzDZK9=6*lD<?zXg2W+5~~vAz>F2D_S{C5hdkCh{Bk`s-U^
z5A+xX1l3=h#D7B0fPprl4kmG0`i~~Uq*Mz5amlrNi4!pZU>6lWeLse`iCCBvF_ihg
zA36boFm^~l`&;Yh@EwORJoX&M0BEg`;V>9Cj{WeA2&>S+058!xqS>@h&1LL?(|bD2
z0h5H^iCGW&eLBt2<+hwX8IP$!FfmE606b^FOhQV8w10)@awbumj8VVMPRO~OBx-vK
z=YZlclRzoWE??$=GZ7^g1YACx&PJN~6Cm(F2fRH8jBzKiaUH<4Xpi}&a0IO_Kpn^S
zPgeIA$^r{JlU(P3N<ADPWd<<m&v0Wq*s13-1CT>7A^f%AS&P8~Vr@D&fU;XP`Xs~#
z!@Z&G|9=#sf=#@57eFu}YVwmU@*dHI6N;G>On~EDC>g-!051V3;e2I4HN+bcd*o56
zIPk8AyacNB54FInG^t(yYDj>7ML$00HWDE9X@CoW4asGzPvd0|26I56$bXY+^4RLX
tPh;ML4HKZvOft-ROac~ov$0r-|2B1)6}ajFj0^w(002ovPDHLkV1iOWDu)07

delta 658
zcmV;D0&V@X1+oQ@EPpU4pb!vHKtRZFkhqxG@K{*r5Evl%_!!uj7*G%Zs5lV#`1t5(
z2yl3Sz{t=s5KqPc00KQpL_t(|oaK}~j@vL0g#{ykS`E2?i)}nq;X*|q4U*Je$TzSL
zkQ+#9R0K$yBc$DK`)w95;anrY0y#sj5dKS|XkQ@H+4K3$<A3AOS@u8I2Y|c%_IM&F
zZujAQKA)(*NdVEOQ+wdIh=GXewmksU$$qW`YG~UQV4DPb;5FO<axkR<*4+gTFs3b_
z2lh#UEE@;ae`wo%T0o_|9r2-k8gXBw`v=;Nsu1>lvVY_{23`9fDT(8`B(ewj^7Cur
z4D{p$IF+A`#D7N2fSwxH2bDM#_D2(;QYtwIUt(vz#EIwuu=WZczg^t7f!L@N(Y4v%
z?=k?K&`$_J^-IcU_d5n|dGtLD4v<n_I_Hcj$98!Jgsq#PfERBaQ61W*W-_+G^}P$;
zF-X{xsCty|(`^nWw_^55c?<)biAf@Nz;gu5B!oZ+M}P1xXA-5#80A|wEA4WUDD^EY
zfsw&X0)<ege3=8rgqPS5F!6Zp7J$700t?i@swJR|8;QnD05zhzEP*UD1no3HHN)z6
z)VB{x0~@`QOvb<%W*9(-2*`!K!$wcgThBxUAOmND+h@U|5xoWYPE9aCxEX&=n*?vr
zy&H=DpMP9b(D;Y90-On6lHF_`&+sOUkk2Gx0t{zDiGX|#uoQp-mK6b6?_Y$U5l1!p
zg*P+A8py(bs0LnzN_7Q{eE{Su+Vxr52!N2+9#%l!2bYz+4(k~?%z+Vk5nGr%R`O3b
s#53}K0;Jl>9HSYNfCk=lEL!3pHg%X4@zy}e01E&B07*qoM6N<$f|+zHVE_OC

diff --git a/graphics/backspr/gBackShinySprite498Garchomp.png b/graphics/backspr/gBackShinySprite498Garchomp.png
index 95fc4333e022798470024bd02d659bc24bab90c7..eb631d8584a5324726b911ffb47ed66e71ff243f 100644
GIT binary patch
delta 195
zcmV;!06hQa1m^^hEHRuh0GyOs7$7)sh`2Gm)y+x(F*!N-`1o*mfWXMmXh<mk_Qkkx
zcvt`c&Bc^wVLaHeU4;RE_#l=0^7w^(y_ET~Eeo<7;#MdIH~|_6+3J2~O61EgjacP=
z++G+39I8N|0r#uy3!uDzFL@rIYE>9Tdv)!F$9p$I$j7>IM)`Q-V(?g)&g_rp&$s1r
x2co>H=hIJn``F9Fasj5g2=kBjeqPuDe*m$=P}0FhYybcN07*p#PDHLkV1mxeV4VN}

delta 195
zcmV;!06hQa1m^^hEHOAhaKMld7$7)sh`9LB7+7eS5D*af`1o*mfWXMmXh<m7SSYw~
zcvuhss5lUL0owbqU4;REGUo2f;}`PvQs&FHEXZ<*TcH@>1ZW^+tNWQLkuSeAVwL-G
zdtnrCr~-io+^@1Pfb#ym<avOqRbdqE)wLHM@7)L?AM3^$<>QTu!DC@Mvp=3c-<HcA
xi1MnQPe1MLV=oWO1(@n0%s<-ud0`9u0RXYXPyp8T4FCWD07*p#PDHLkV1noTT;>1(

diff --git a/graphics/backspr/gBackShinySprite913GarchompMega.png b/graphics/backspr/gBackShinySprite913GarchompMega.png
index 1de06d08be28e4910617ab8e3d690249de7093d2..cbec8e30700bfbda934b1cc549f40be261539c66 100644
GIT binary patch
delta 593
zcmV-X0<Qgn1%U;SEH#`l0GyOsgBSqKN&qpv)fgZ-|MtcB`1o*mfWXMmXgONAaClk(
z0L{geC@4^7m69d^00In=VH1D2Y^lYDJjjJbZQdZc3udqciON)Ija39(h4=+b5aeB4
zrm;yX;X+3i#C6GfW^Z*m@6PE7vW1%OH{blxXq09D-;wtW`288xZLu@vjVbk*&Z;p4
z$;8C;fDyBtkpLDzgE2GNpo9*9LI7OLdH|q}<=lbVK@aFEwy#NBLKlCn1q0SWEjz$M
zn;7^3g2LKoK$|o`Dk7el89LXZc@>XgLMrt}?X%I&ynZWL(0EE;3luNkB~u`!C=54<
zXyNqqg<w&Zeo*auCVmMPMbWiVpVV*?_t|&KQ?A`{fJ{IodH{a&v=|u&aPfmWN;3qY
z!S(soL^9X|53BRr3<ZCKJ+S@qTo5zAFdk@bWt{+Ly~Bu}<p7RMrsEF0YL0-1m8d(P
zLECB5{Ja{8=M0*Ft(1iKnKQuOd$|t_ftYSZV4}MwsfNwH1T0-w0_bLQcb8V^LJ4Hj
zY|{ALs;&eeqWP2p76=GcPMgot2&~n?<DURn5A65#qXcMZm;Habeh>icWj;Ms0-(P<
z;R)9Z>9P$0QytS8m>toTKM_N{eHyRGq8$Ec+*2LUe;$B5(xHxkBGO|ZkM&T<VML_}
z91POfny)1R*M9R|0xT|S#VM{YtL|Hh4Q}ShWzN5^s$m9=0acgZF8ujfe;pbq>@&>Q
fH~w#7!3K{HE$<NkswG`p00000NkvXXu0mjf5n>d^

delta 594
zcmV-Y0<Hal1%d^TEHz+2fWVLtI3Q4XSfKdO7!VK;z(~0G`1o*mfWXMmXgFB7aClGv
zP@q7lC@4^y=!KC000Iq>VH1BiZ>hzGJjjJbZQdZ!1v6NJL}jY9#wrY|Li_?I2=Xp2
z)7T`HaG@g$;<{u#v$r~(cjxp3*+R|tn{WPTG|IC7@5p-r{QeB;w%8f-)|7fkXVn;j
zWMX7Gz=&DSNdOC=!I+6`P(lkpApovnJpj<ea_&Iwpab+Ywy#KAKpTIp1q0SWEn2`r
zlNk5`g2KvYK$|o`Dk7en2|CxHc^!{oL@M=0?X%I&ym=>C(0EE;3lt~slPQo=6owl_
zv~YIzO0XzPKd9yd6TbwDqG(&GPAfQ#`|LX9DOc_|KqjCPJpjLXT8s<>IR8N%r5OTH
z<N9JXk_`61<MQGzL&1Mw4{Wbr3S#CL#sl@8tP|j@cNoyK9Keyuc-Vng%@Odp6m{n_
zXgjX!pR0j*&Y%g{N=bO1IRpHCko&L@i1AhgM!Id1YS=tTz{0g9fUY<9_i2SLlt3o+
zCXLUnYD)kj>dz@)fq+ouxc-tF&>~wMJpKuQ^}v2#KS_XwX3>AG>qh~=PUh1yO#t+l
zCp_VLAzijUV5Y}(1|~;z<xfOkZ=T01vMBpM8uwfW^q&VHk94RaposJs$YVVeau`u5
z0tbUMw&H6^z|G3HkO1?`N^y#tt7-c!#Rj)C<T7X9m(zX*jR93x-!A?6S%2*tDC{!K
g*0=s|Va^6m4=ob!0G6e$DgXcg07*qoM6N<$f))W2*8l(j

diff --git a/src/Egg_Moves.c b/src/Egg_Moves.c
index f0b0f27..e22eb0d 100644
--- a/src/Egg_Moves.c
+++ b/src/Egg_Moves.c
@@ -125,7 +125,8 @@ const u16 gEggMoves[] =
 		MOVE_CHIPAWAY,
 		MOVE_ROCKCLIMB,
 		MOVE_ROTOTILLER,
-		MOVE_HONECLAWS),
+		MOVE_HONECLAWS,
+		MOVE_MUDSLAP),
 
 	egg_moves(NIDORAN_F,
 		MOVE_SUPERSONIC,
@@ -347,7 +348,9 @@ const u16 gEggMoves[] =
 		MOVE_SKILLSWAP,
 		MOVE_GUARDSPLIT,
 		MOVE_PSYCHOSHIFT,
-		MOVE_PSYCHICTERRAIN),
+		MOVE_PSYCHICTERRAIN,
+		MOVE_CONFUSION,
+		MOVE_MAGICCOAT),
 
 	egg_moves(MACHOP,
 		MOVE_MEDITATE,
@@ -595,7 +598,10 @@ const u16 gEggMoves[] =
 		MOVE_SKILLSWAP,
 		MOVE_NATURALGIFT,
 		MOVE_BLOCK,
-		MOVE_GRASSYTERRAIN),
+		MOVE_GRASSYTERRAIN,
+		MOVE_SLEEPPOWDER,
+		MOVE_STUNSPORE,
+		MOVE_POISONPOWDER),
 
 	egg_moves(CUBONE,
 		MOVE_ANCIENTPOWER,
@@ -608,7 +614,8 @@ const u16 gEggMoves[] =
 		MOVE_DETECT,
 		MOVE_ENDURE,
 		MOVE_CHIPAWAY,
-		MOVE_CURSE),
+		MOVE_CURSE,
+		MOVE_LEER),
 
 	egg_moves(LICKITUNG,
 		MOVE_BELLYDRUM,
@@ -758,7 +765,9 @@ const u16 gEggMoves[] =
 		MOVE_NIGHTSLASH,
 		MOVE_DEFOG,
 		MOVE_STEELWING,
-		MOVE_QUICKGUARD),
+		MOVE_QUICKGUARD,
+		MOVE_FEINT,
+		MOVE_DUALWINGBEAT),
 
 	egg_moves(PINSIR,
 		MOVE_FURYATTACK,
@@ -769,6 +778,7 @@ const u16 gEggMoves[] =
 		MOVE_FEINT,
 		MOVE_MEFIRST,
 		MOVE_BUGBITE,
+		MOVE_THRASH,
 		MOVE_SUPERPOWER),
 
 	egg_moves(LAPRAS,
@@ -846,7 +856,8 @@ const u16 gEggMoves[] =
 		MOVE_ASSURANCE,
 		MOVE_ROOST,
 		MOVE_TAILWIND,
-		MOVE_WIDEGUARD),
+		MOVE_WIDEGUARD,
+		MOVE_DUALWINGBEAT),
 
 	egg_moves(SNORLAX,
 		MOVE_LICK,
@@ -1103,7 +1114,11 @@ const u16 gEggMoves[] =
 		MOVE_BODYSLAM,
 		MOVE_WATERSPORT,
 		MOVE_MUDDYWATER,
-		MOVE_CAMOUFLAGE),
+		MOVE_CAMOUFLAGE,
+		MOVE_COPYCAT,
+		MOVE_SING,
+		MOVE_SOAK,
+		MOVE_TICKLE),
 
 	egg_moves(SUDOWOODO,
 		MOVE_SELFDESTRUCT,
@@ -1270,7 +1285,9 @@ const u16 gEggMoves[] =
 		MOVE_AGILITY,
 		MOVE_SECRETPOWER,
 		MOVE_SLEEPTALK,
-		MOVE_HEX),
+		MOVE_HEX,
+		MOVE_AQUATAIL,
+		MOVE_LASTRESORT),
 
 	egg_moves(GLIGAR,
 		MOVE_METALCLAW,
@@ -1342,7 +1359,10 @@ const u16 gEggMoves[] =
 		MOVE_SEISMICTOSS,
 		MOVE_FOCUSPUNCH,
 		MOVE_MEGAHORN,
-		MOVE_ROCKBLAST),
+		MOVE_ROCKBLAST,
+		MOVE_NIGHTSLASH,
+		MOVE_FEINT,
+		MOVE_TAKEDOWN),
 
 	egg_moves(SNEASEL,
 		MOVE_COUNTER,
@@ -1485,7 +1505,11 @@ const u16 gEggMoves[] =
 		MOVE_ASSURANCE,
 		MOVE_GUARDSWAP,
 		MOVE_STEALTHROCK,
-		MOVE_ENDURE),
+		MOVE_ENDURE,
+		MOVE_AIRCUTTER,
+		MOVE_NIGHTSLASH,
+		MOVE_FEINT,
+		MOVE_ROOST),
 
 	egg_moves(HOUNDOUR,
 		MOVE_FIRESPIN,
@@ -1597,7 +1621,8 @@ const u16 gEggMoves[] =
 		MOVE_PUNISHMENT,
 		MOVE_NATURALGIFT,
 		MOVE_HEARTSTAMP,
-		MOVE_BELCH),
+		MOVE_BELCH,
+		MOVE_FOCUSPUNCH),
 
 	egg_moves(LARVITAR,
 		MOVE_PURSUIT,
@@ -1949,7 +1974,8 @@ const u16 gEggMoves[] =
 		MOVE_SWIFT,
 		MOVE_BRINE,
 		MOVE_DESTINYBOND,
-		MOVE_PSYCHICFANGS),
+		MOVE_PSYCHICFANGS,
+		MOVE_WATERPULSE),
 
 	egg_moves(TRAPINCH,
 		MOVE_FOCUSENERGY,
@@ -2075,7 +2101,12 @@ const u16 gEggMoves[] =
 		MOVE_SOAK,
 		MOVE_MUDDYWATER,
 		MOVE_COPYCAT,
-		MOVE_CAMOUFLAGE),
+		MOVE_CAMOUFLAGE,
+		MOVE_AQUAJET,
+		MOVE_BELLYDRUM,
+		MOVE_PERISHSONG,
+		MOVE_PRESENT,
+		MOVE_SUPERSONIC),
 
 	egg_moves(SPOINK,
 		MOVE_FUTURESIGHT,
@@ -2529,7 +2560,8 @@ const u16 gEggMoves[] =
 		MOVE_SIGNALBEAM,
 		MOVE_HELPINGHAND,
 		MOVE_EERIEIMPULSE,
-		MOVE_FAKETEARS),
+		MOVE_FAKETEARS,
+		MOVE_BABYDOLLEYES),
 
 	egg_moves(BUDEW,
 		MOVE_SPIKES,
@@ -2674,7 +2706,8 @@ const u16 gEggMoves[] =
 		MOVE_TEETERDANCE,
 		MOVE_COSMICPOWER,
 		MOVE_MUDSPORT,
-		MOVE_POWERUPPUNCH),
+		MOVE_POWERUPPUNCH,
+		MOVE_TRIPLEAXEL),
 
 	egg_moves(GLAMEOW,
 		MOVE_BITE,
@@ -2753,7 +2786,8 @@ const u16 gEggMoves[] =
 		MOVE_GRAVITY,
 		MOVE_MUDBOMB,
 		MOVE_NATURALGIFT,
-		MOVE_ENDURE),
+		MOVE_ENDURE,
+		MOVE_SEISMICTOSS),
 
 	egg_moves(CHATOT,
 		MOVE_ENCORE,
@@ -2989,7 +3023,8 @@ const u16 gEggMoves[] =
 		MOVE_THUNDERFANG,
 		MOVE_ICEFANG,
 		MOVE_AFTERYOU,
-		MOVE_PSYCHICFANGS),
+		MOVE_PSYCHICFANGS,
+		MOVE_COVET),
 
 	egg_moves(PURRLOIN,
 		MOVE_PAYDAY,
@@ -3179,7 +3214,9 @@ const u16 gEggMoves[] =
 		MOVE_TOXICSPIKES,
 		MOVE_SPIKES,
 		MOVE_TAKEDOWN,
-		MOVE_ROCKCLIMB),
+		MOVE_ROCKCLIMB,
+		MOVE_BITE,
+		MOVE_FURYCUTTER),
 
 	egg_moves(COTTONEE,
 		MOVE_NATURALGIFT,
@@ -3232,7 +3269,9 @@ const u16 gEggMoves[] =
 		MOVE_COUNTER,
 		MOVE_MEANLOOK,
 		MOVE_MEFIRST,
-		MOVE_POWERTRIP),
+		MOVE_POWERTRIP,
+		MOVE_AQUATAIL,
+		MOVE_SPITE),
 
 	egg_moves(DARUMAKA,
 		MOVE_SLEEPTALK,
@@ -3362,7 +3401,8 @@ const u16 gEggMoves[] =
 		MOVE_FAKETEARS,
 		MOVE_SLEEPTALK,
 		MOVE_ENDURE,
-		MOVE_FLAIL),
+		MOVE_FLAIL,
+		MOVE_TRIPLEAXEL),
 
 	egg_moves(GOTHITA,
 		MOVE_MIRRORCOAT,
@@ -3433,7 +3473,8 @@ const u16 gEggMoves[] =
 		MOVE_TICKLE,
 		MOVE_BATONPASS,
 		MOVE_IONDELUGE,
-		MOVE_SPEEDSWAP),
+		MOVE_SPEEDSWAP,
+		MOVE_DEFOG),
 
 	egg_moves(KARRABLAST,
 		MOVE_MEGAHORN,
@@ -3456,7 +3497,8 @@ const u16 gEggMoves[] =
 		MOVE_ROLLOUT,
 		MOVE_DEFENSECURL,
 		MOVE_ENDURE,
-		MOVE_BODYSLAM),
+		MOVE_BODYSLAM,
+		MOVE_WORRYSEED),
 
 	egg_moves(FRILLISH,
 		MOVE_ACIDARMOR,
@@ -3585,7 +3627,8 @@ const u16 gEggMoves[] =
 		MOVE_LOWKICK,
 		MOVE_FEINT,
 		MOVE_MEFIRST,
-		MOVE_KNOCKOFF),
+		MOVE_KNOCKOFF,
+		MOVE_FOCUSPUNCH),
 
 	egg_moves(DRUDDIGON,
 		MOVE_FIREFANG,
@@ -3598,7 +3641,8 @@ const u16 gEggMoves[] =
 		MOVE_SNATCH,
 		MOVE_METALCLAW,
 		MOVE_GLARE,
-		MOVE_SUCKERPUNCH),
+		MOVE_SUCKERPUNCH,
+		MOVE_NIGHTSLASH),
 
 	egg_moves(PAWNIARD,
 		MOVE_REVENGE,
@@ -3620,7 +3664,8 @@ const u16 gEggMoves[] =
 		MOVE_IRONHEAD,
 		MOVE_AMNESIA,
 		MOVE_BELCH,
-		MOVE_COTTONGUARD),
+		MOVE_COTTONGUARD,
+		MOVE_ENDEAVOR),
 
 	egg_moves(VULLABY,
 		MOVE_STEELWING,
@@ -3678,7 +3723,9 @@ const u16 gEggMoves[] =
 		MOVE_ENDURE,
 		MOVE_ZENHEADBUTT,
 		MOVE_MORNINGSUN,
-		MOVE_MAGNETRISE),
+		MOVE_MAGNETRISE,
+		MOVE_LEECHLIFE,
+		MOVE_THRASH),
 
 	egg_moves(SHELLOS_EAST,
 		MOVE_COUNTER,
@@ -3782,7 +3829,9 @@ const u16 gEggMoves[] =
 	egg_moves(FLETCHLING,
 		MOVE_TAILWIND,
 		MOVE_SNATCH,
-		MOVE_QUICKGUARD),
+		MOVE_QUICKGUARD,
+		MOVE_FLAMECHARGE,
+		MOVE_DEFOG),
 
 	egg_moves(LITLEO,
 		MOVE_ENTRAINMENT,
@@ -3871,14 +3920,18 @@ const u16 gEggMoves[] =
 		MOVE_PLAYROUGH,
 		MOVE_HAZE,
 		MOVE_ACIDARMOR,
-		MOVE_VENOMDRENCH),
+		MOVE_VENOMDRENCH,
+		MOVE_TWISTER,
+		MOVE_DRAGONTAIL),
 
 	egg_moves(CLAUNCHER,
 		MOVE_AQUAJET,
 		MOVE_ENTRAINMENT,
 		MOVE_ENDURE,
 		MOVE_CRABHAMMER,
-		MOVE_HELPINGHAND),
+		MOVE_HELPINGHAND,
+		MOVE_AQUATAIL,
+		MOVE_BUBBLEBEAM),
 
 	egg_moves(HELIOPTILE,
 		MOVE_AGILITY,
@@ -3921,7 +3974,8 @@ const u16 gEggMoves[] =
 		MOVE_COVET,
 		MOVE_HELPINGHAND,
 		MOVE_NATURALGIFT,
-		MOVE_TEARFULLOOK),
+		MOVE_TEARFULLOOK,
+		MOVE_MAGNETRISE),
 
 	egg_moves(GOOMY,
 		MOVE_ACIDARMOR,
@@ -3936,7 +3990,8 @@ const u16 gEggMoves[] =
 		MOVE_SWITCHEROO,
 		MOVE_THIEF,
 		MOVE_LOCKON,
-		MOVE_IRONDEFENSE),
+		MOVE_IRONDEFENSE,
+		MOVE_MAGNETRISE),
 
 	egg_moves(PHANTUMP,
 		MOVE_GRUDGE,
@@ -4085,7 +4140,9 @@ const u16 gEggMoves[] =
 		MOVE_FIREFANG,
 		MOVE_THUNDERFANG,
 		MOVE_SUCKERPUNCH,
-		MOVE_THRASH),
+		MOVE_THRASH,
+		MOVE_ENDEAVOR,
+		MOVE_LASTRESORT),
 
 	egg_moves(WISHIWASHI,
 		MOVE_MUDDYWATER,
@@ -4124,7 +4181,8 @@ const u16 gEggMoves[] =
 		MOVE_GIGADRAIN,
 		MOVE_AROMATHERAPY,
 		MOVE_DEFOG,
-		MOVE_LEAFSTORM),
+		MOVE_LEAFSTORM,
+		MOVE_WORRYSEED),
 
 	egg_moves(MORELULL,
 		MOVE_AMNESIA,
@@ -4166,7 +4224,9 @@ const u16 gEggMoves[] =
 		MOVE_ENDURE,
 		MOVE_AMNESIA,
 		MOVE_AFTERYOU,
-		MOVE_LUCKYCHANT),
+		MOVE_LUCKYCHANT,
+		MOVE_WORRYSEED,
+		MOVE_LEAFTORNADO),
 
 	egg_moves(ORANGURU,
 		MOVE_EXTRASENSORY,
diff --git a/src/Learnsets.c b/src/Learnsets.c
index 72e3a55..fb57d2a 100644
--- a/src/Learnsets.c
+++ b/src/Learnsets.c
@@ -2133,59 +2133,58 @@ static const struct LevelUpMove sMarowakLevelUpLearnset[] = {
 };
 
 static const struct LevelUpMove sHitmonleeLevelUpLearnset[] = {
-	LEVEL_UP_MOVE( 0, MOVE_DOUBLEKICK),
-	LEVEL_UP_MOVE( 1, MOVE_REVERSAL),
-	LEVEL_UP_MOVE( 1, MOVE_CLOSECOMBAT),
-	LEVEL_UP_MOVE( 1, MOVE_MEGAKICK),
-	LEVEL_UP_MOVE( 1, MOVE_REVENGE),
+	LEVEL_UP_MOVE( 0, MOVE_BRICKBREAK),
+	LEVEL_UP_MOVE( 1, MOVE_FEINT),
+	LEVEL_UP_MOVE( 1, MOVE_LOWSWEEP),
+	LEVEL_UP_MOVE( 1, MOVE_TACKLE),
+	LEVEL_UP_MOVE( 1, MOVE_HELPINGHAND),
+	LEVEL_UP_MOVE( 1, MOVE_FAKEOUT),
+	LEVEL_UP_MOVE( 1, MOVE_FOCUSENERGY),
+	LEVEL_UP_MOVE( 1, MOVE_FORESIGHT),
 	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(19, MOVE_DOUBLEKICK),
-	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(35, MOVE_MEGAKICK),
+	LEVEL_UP_MOVE(40, MOVE_JUMPKICK),
+	LEVEL_UP_MOVE(45, MOVE_REVERSAL),
+	LEVEL_UP_MOVE(50, MOVE_HIGHJUMPKICK),
+	LEVEL_UP_MOVE(55, MOVE_CLOSECOMBAT),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sHitmonchanLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 0, MOVE_COMETPUNCH),
-	LEVEL_UP_MOVE( 1, MOVE_CLOSECOMBAT),
-	LEVEL_UP_MOVE( 1, MOVE_COUNTER),
-	LEVEL_UP_MOVE( 1, MOVE_FOCUSPUNCH),
-	LEVEL_UP_MOVE( 1, MOVE_REVENGE),
-	LEVEL_UP_MOVE( 1, MOVE_AGILITY),
+	LEVEL_UP_MOVE( 1, MOVE_DRAINPUNCH),
+	LEVEL_UP_MOVE( 1, MOVE_FEINT),
+	LEVEL_UP_MOVE( 1, MOVE_VACUUMWAVE),
+	LEVEL_UP_MOVE( 1, MOVE_BULLETPUNCH),
+	LEVEL_UP_MOVE( 1, MOVE_TACKLE),
+	LEVEL_UP_MOVE( 1, MOVE_HELPINGHAND),
+	LEVEL_UP_MOVE( 1, MOVE_FAKEOUT),
+	LEVEL_UP_MOVE( 1, MOVE_FOCUSENERGY),
 	LEVEL_UP_MOVE( 1, MOVE_PURSUIT),
-	LEVEL_UP_MOVE( 1, MOVE_MACHPUNCH),
-	LEVEL_UP_MOVE( 6, MOVE_AGILITY),
-	LEVEL_UP_MOVE(11, MOVE_PURSUIT),
-	LEVEL_UP_MOVE(16, MOVE_MACHPUNCH),
-	LEVEL_UP_MOVE(16, MOVE_BULLETPUNCH),
+	LEVEL_UP_MOVE( 4, MOVE_MACHPUNCH),
+	LEVEL_UP_MOVE( 8, MOVE_POWERUPPUNCH),
+	LEVEL_UP_MOVE(12, MOVE_DETECT),
+	LEVEL_UP_MOVE(16, MOVE_REVENGE),
 	LEVEL_UP_MOVE(19, MOVE_COMETPUNCH),
-	LEVEL_UP_MOVE(21, MOVE_FEINT),
-	LEVEL_UP_MOVE(26, MOVE_VACUUMWAVE),
-	LEVEL_UP_MOVE(31, MOVE_QUICKGUARD),
-	LEVEL_UP_MOVE(36, MOVE_THUNDERPUNCH),
-	LEVEL_UP_MOVE(36, MOVE_ICEPUNCH),
-	LEVEL_UP_MOVE(36, MOVE_FIREPUNCH),
-	LEVEL_UP_MOVE(41, MOVE_SKYUPPERCUT),
-	LEVEL_UP_MOVE(46, MOVE_MEGAPUNCH),
-	LEVEL_UP_MOVE(50, MOVE_DETECT),
-	LEVEL_UP_MOVE(56, MOVE_FOCUSPUNCH),
-	LEVEL_UP_MOVE(61, MOVE_COUNTER),
-	LEVEL_UP_MOVE(66, MOVE_CLOSECOMBAT),
+	LEVEL_UP_MOVE(21, MOVE_QUICKGUARD),
+	LEVEL_UP_MOVE(25, MOVE_THUNDERPUNCH),
+	LEVEL_UP_MOVE(25, MOVE_ICEPUNCH),
+	LEVEL_UP_MOVE(25, MOVE_FIREPUNCH),
+	LEVEL_UP_MOVE(30, MOVE_AGILITY),
+	LEVEL_UP_MOVE(35, MOVE_MEGAPUNCH),
+	LEVEL_UP_MOVE(40, MOVE_SKYUPPERCUT),
+	LEVEL_UP_MOVE(45, MOVE_COUNTER),
+	LEVEL_UP_MOVE(50, MOVE_FOCUSPUNCH),
+	LEVEL_UP_MOVE(55, MOVE_CLOSECOMBAT),
 	LEVEL_UP_END
 };
 
@@ -4447,12 +4446,13 @@ static const struct LevelUpMove sSneaselLevelUpLearnset[] = {
 	LEVEL_UP_MOVE(20, MOVE_AGILITY),
 	LEVEL_UP_MOVE(22, MOVE_METALCLAW),
 	LEVEL_UP_MOVE(25, MOVE_HONECLAWS),
-	LEVEL_UP_MOVE(28, MOVE_BEATUP),
+	LEVEL_UP_MOVE(28, MOVE_ICESHARD),
+	LEVEL_UP_MOVE(30, MOVE_BEATUP),
 	LEVEL_UP_MOVE(32, MOVE_SCREECH),
-	LEVEL_UP_MOVE(35, MOVE_SLASH),
+	LEVEL_UP_MOVE(35, MOVE_PUNISHMENT),
 	LEVEL_UP_MOVE(40, MOVE_SNATCH),
-	LEVEL_UP_MOVE(44, MOVE_PUNISHMENT),
-	LEVEL_UP_MOVE(47, MOVE_ICESHARD),
+	LEVEL_UP_MOVE(44, MOVE_SLASH),
+	LEVEL_UP_MOVE(52, MOVE_TRIPLEAXEL),
 	LEVEL_UP_END
 };
 
@@ -4872,28 +4872,27 @@ static const struct LevelUpMove sTyrogueLevelUpLearnset[] = {
 
 static const struct LevelUpMove sHitmontopLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 0, MOVE_ROLLINGKICK),
-	LEVEL_UP_MOVE( 1, MOVE_ROLLINGKICK),
-	LEVEL_UP_MOVE( 1, MOVE_ENDEAVOR),
-	LEVEL_UP_MOVE( 1, MOVE_CLOSECOMBAT),
-	LEVEL_UP_MOVE( 1, MOVE_DETECT),
-	LEVEL_UP_MOVE( 1, MOVE_REVENGE),
+	LEVEL_UP_MOVE( 1, MOVE_FEINT),
+	LEVEL_UP_MOVE( 1, MOVE_RAPIDSPIN),
+	LEVEL_UP_MOVE( 1, MOVE_TACKLE),
+	LEVEL_UP_MOVE( 1, MOVE_HELPINGHAND),
+	LEVEL_UP_MOVE( 1, MOVE_FAKEOUT),
 	LEVEL_UP_MOVE( 1, MOVE_FOCUSENERGY),
 	LEVEL_UP_MOVE( 1, MOVE_PURSUIT),
-	LEVEL_UP_MOVE( 1, MOVE_QUICKATTACK),
-	LEVEL_UP_MOVE( 6, MOVE_FOCUSENERGY),
-	LEVEL_UP_MOVE(10, MOVE_PURSUIT),
-	LEVEL_UP_MOVE(15, MOVE_QUICKATTACK),
-	LEVEL_UP_MOVE(19, MOVE_RAPIDSPIN),
-	LEVEL_UP_MOVE(24, MOVE_FEINT),
-	LEVEL_UP_MOVE(28, MOVE_COUNTER),
-	LEVEL_UP_MOVE(33, MOVE_TRIPLEKICK),
-	LEVEL_UP_MOVE(37, MOVE_AGILITY),
-	LEVEL_UP_MOVE(42, MOVE_GYROBALL),
-	LEVEL_UP_MOVE(46, MOVE_WIDEGUARD),
-	LEVEL_UP_MOVE(46, MOVE_QUICKGUARD),
-	LEVEL_UP_MOVE(50, MOVE_DETECT),
+	LEVEL_UP_MOVE( 4, MOVE_QUICKATTACK),
+	LEVEL_UP_MOVE( 8, MOVE_GYROBALL),
+	LEVEL_UP_MOVE(12, MOVE_DETECT),
+	LEVEL_UP_MOVE(16, MOVE_REVENGE),
+	LEVEL_UP_MOVE(19, MOVE_ROLLINGKICK),
+	LEVEL_UP_MOVE(21, MOVE_WIDEGUARD),
+	LEVEL_UP_MOVE(21, MOVE_QUICKGUARD),
+	LEVEL_UP_MOVE(25, MOVE_SUCKERPUNCH),
+	LEVEL_UP_MOVE(30, MOVE_AGILITY),
+	LEVEL_UP_MOVE(35, MOVE_DIG),
+	LEVEL_UP_MOVE(40, MOVE_TRIPLEKICK),
+	LEVEL_UP_MOVE(45, MOVE_COUNTER),
+	LEVEL_UP_MOVE(50, MOVE_ENDEAVOR),
 	LEVEL_UP_MOVE(55, MOVE_CLOSECOMBAT),
-	LEVEL_UP_MOVE(60, MOVE_ENDEAVOR),
 	LEVEL_UP_END
 };
 
@@ -8756,50 +8755,53 @@ static const struct LevelUpMove sDrifblimLevelUpLearnset[] = {
 
 static const struct LevelUpMove sBunearyLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_FRUSTRATION),
-	LEVEL_UP_MOVE( 1, MOVE_DEFENSECURL),
+	LEVEL_UP_MOVE( 1, MOVE_FORESIGHT),
 	LEVEL_UP_MOVE( 1, MOVE_SPLASH),
 	LEVEL_UP_MOVE( 1, MOVE_POUND),
-	LEVEL_UP_MOVE( 1, MOVE_FORESIGHT),
+	LEVEL_UP_MOVE( 4, MOVE_DEFENSECURL),
 	LEVEL_UP_MOVE( 6, MOVE_ENDURE),
-	LEVEL_UP_MOVE(13, MOVE_BABYDOLLEYES),
+	LEVEL_UP_MOVE( 8, MOVE_BABYDOLLEYES),
+	LEVEL_UP_MOVE(12, MOVE_AFTERYOU),
 	LEVEL_UP_MOVE(16, MOVE_QUICKATTACK),
-	LEVEL_UP_MOVE(23, MOVE_JUMPKICK),
-	LEVEL_UP_MOVE(26, MOVE_BATONPASS),
-	LEVEL_UP_MOVE(33, MOVE_AGILITY),
-	LEVEL_UP_MOVE(36, MOVE_DIZZYPUNCH),
-	LEVEL_UP_MOVE(43, MOVE_AFTERYOU),
-	LEVEL_UP_MOVE(46, MOVE_CHARM),
-	LEVEL_UP_MOVE(50, MOVE_ENTRAINMENT),
-	LEVEL_UP_MOVE(56, MOVE_BOUNCE),
-	LEVEL_UP_MOVE(63, MOVE_HEALINGWISH),
+	LEVEL_UP_MOVE(20, MOVE_DOUBLEKICK),
+	LEVEL_UP_MOVE(24, MOVE_CHARM),
+	LEVEL_UP_MOVE(28, MOVE_BATONPASS),
+	LEVEL_UP_MOVE(32, MOVE_HEADBUTT),
+	LEVEL_UP_MOVE(36, MOVE_AGILITY),
+	LEVEL_UP_MOVE(40, MOVE_ENTRAINMENT),
+	LEVEL_UP_MOVE(44, MOVE_DIZZYPUNCH),
+	LEVEL_UP_MOVE(48, MOVE_FLATTER),
+	LEVEL_UP_MOVE(52, MOVE_JUMPKICK),
+	LEVEL_UP_MOVE(46, MOVE_BOUNCE),
+	LEVEL_UP_MOVE(60, MOVE_HEALINGWISH),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sLopunnyLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 0, MOVE_RETURN),
-	LEVEL_UP_MOVE( 1, MOVE_RETURN),
-	LEVEL_UP_MOVE( 1, MOVE_HEALINGWISH),
-	LEVEL_UP_MOVE( 1, MOVE_BOUNCE),
-	LEVEL_UP_MOVE( 1, MOVE_ROTOTILLER),
+	LEVEL_UP_MOVE( 1, MOVE_FORESIGHT),
 	LEVEL_UP_MOVE( 1, MOVE_MIRRORCOAT),
 	LEVEL_UP_MOVE( 1, MOVE_MAGICCOAT),
-	LEVEL_UP_MOVE( 1, MOVE_DEFENSECURL),
+	LEVEL_UP_MOVE( 1, MOVE_ROTOTILLER),
 	LEVEL_UP_MOVE( 1, MOVE_SPLASH),
 	LEVEL_UP_MOVE( 1, MOVE_POUND),
-	LEVEL_UP_MOVE( 1, MOVE_FORESIGHT),
-	LEVEL_UP_MOVE( 6, MOVE_ENDURE),
-	LEVEL_UP_MOVE(13, MOVE_BABYDOLLEYES),
+	LEVEL_UP_MOVE( 1, MOVE_DEFENSECURL),
+	LEVEL_UP_MOVE( 1, MOVE_ENDURE),
+	LEVEL_UP_MOVE( 1, MOVE_BABYDOLLEYES),
+	LEVEL_UP_MOVE(12, MOVE_AFTERYOU),
 	LEVEL_UP_MOVE(16, MOVE_QUICKATTACK),
-	LEVEL_UP_MOVE(23, MOVE_JUMPKICK),
-	LEVEL_UP_MOVE(26, MOVE_BATONPASS),
-	LEVEL_UP_MOVE(33, MOVE_AGILITY),
-	LEVEL_UP_MOVE(36, MOVE_DIZZYPUNCH),
-	LEVEL_UP_MOVE(43, MOVE_AFTERYOU),
-	LEVEL_UP_MOVE(46, MOVE_CHARM),
-	LEVEL_UP_MOVE(53, MOVE_ENTRAINMENT),
+	LEVEL_UP_MOVE(20, MOVE_DOUBLEKICK),
+	LEVEL_UP_MOVE(24, MOVE_CHARM),
+	LEVEL_UP_MOVE(28, MOVE_BATONPASS),
+	LEVEL_UP_MOVE(32, MOVE_HEADBUTT),
+	LEVEL_UP_MOVE(36, MOVE_AGILITY),
+	LEVEL_UP_MOVE(40, MOVE_ENTRAINMENT),
+	LEVEL_UP_MOVE(44, MOVE_DIZZYPUNCH),
+	LEVEL_UP_MOVE(48, MOVE_FLATTER),
+	LEVEL_UP_MOVE(52, MOVE_JUMPKICK),
 	LEVEL_UP_MOVE(56, MOVE_BOUNCE),
-	LEVEL_UP_MOVE(63, MOVE_HEALINGWISH),
-	LEVEL_UP_MOVE(66, MOVE_HIGHJUMPKICK),
+	LEVEL_UP_MOVE(60, MOVE_HEALINGWISH),
+	LEVEL_UP_MOVE(64, MOVE_HIGHJUMPKICK),
 	LEVEL_UP_END
 };
 
@@ -9445,13 +9447,14 @@ static const struct LevelUpMove sAbomasnowLevelUpLearnset[] = {
 };
 
 static const struct LevelUpMove sWeavileLevelUpLearnset[] = {
+	LEVEL_UP_MOVE( 0, MOVE_ASSURANCE),
 	LEVEL_UP_MOVE( 1, MOVE_EMBARGO),
 	LEVEL_UP_MOVE( 1, MOVE_REVENGE),
-	LEVEL_UP_MOVE( 1, MOVE_ASSURANCE),
+	LEVEL_UP_MOVE( 1, MOVE_BEATUP),
+	LEVEL_UP_MOVE( 1, MOVE_SLASH),
 	LEVEL_UP_MOVE( 1, MOVE_SCRATCH),
 	LEVEL_UP_MOVE( 1, MOVE_LEER),
 	LEVEL_UP_MOVE( 1, MOVE_TAUNT),
-	LEVEL_UP_MOVE( 1, MOVE_QUICKATTACK),
 	LEVEL_UP_MOVE( 8, MOVE_QUICKATTACK),
 	LEVEL_UP_MOVE(10, MOVE_FEINTATTACK),
 	LEVEL_UP_MOVE(14, MOVE_ICYWIND),
@@ -9459,12 +9462,14 @@ static const struct LevelUpMove sWeavileLevelUpLearnset[] = {
 	LEVEL_UP_MOVE(20, MOVE_NASTYPLOT),
 	LEVEL_UP_MOVE(22, MOVE_METALCLAW),
 	LEVEL_UP_MOVE(25, MOVE_HONECLAWS),
-	LEVEL_UP_MOVE(28, MOVE_FLING),
+	LEVEL_UP_MOVE(28, MOVE_ICESHARD),
+	LEVEL_UP_MOVE(30, MOVE_FLING),
 	LEVEL_UP_MOVE(32, MOVE_SCREECH),
-	LEVEL_UP_MOVE(35, MOVE_NIGHTSLASH),
+	LEVEL_UP_MOVE(35, MOVE_PUNISHMENT),
 	LEVEL_UP_MOVE(40, MOVE_SNATCH),
-	LEVEL_UP_MOVE(44, MOVE_PUNISHMENT),
-	LEVEL_UP_MOVE(47, MOVE_DARKPULSE),
+	LEVEL_UP_MOVE(44, MOVE_NIGHTSLASH),
+	LEVEL_UP_MOVE(52, MOVE_DARKPULSE),
+	LEVEL_UP_MOVE(58, MOVE_TRIPLEAXEL),
 	LEVEL_UP_END
 };
 
@@ -11792,32 +11797,46 @@ static const struct LevelUpMove sZoroarkLevelUpLearnset[] = {
 
 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( 4, MOVE_HELPINGHAND),
+	LEVEL_UP_MOVE( 7, MOVE_ECHOEDVOICE),
+	LEVEL_UP_MOVE(10, MOVE_SING),
 	LEVEL_UP_MOVE(13, MOVE_DOUBLESLAP),
-	LEVEL_UP_MOVE(15, MOVE_ENCORE),
+	LEVEL_UP_MOVE(16, MOVE_CHARM),
 	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(22, MOVE_ENCORE),
+	LEVEL_UP_MOVE(25, MOVE_AFTERYOU),
+	LEVEL_UP_MOVE(28, MOVE_TAILSLAP),
 	LEVEL_UP_MOVE(31, MOVE_WAKEUPSLAP),
-	LEVEL_UP_MOVE(33, MOVE_ECHOEDVOICE),
+	LEVEL_UP_MOVE(34, MOVE_TICKLE),
 	LEVEL_UP_MOVE(37, MOVE_SLAM),
-	LEVEL_UP_MOVE(39, MOVE_CAPTIVATE),
+	LEVEL_UP_MOVE(40, MOVE_CAPTIVATE),
 	LEVEL_UP_MOVE(43, MOVE_HYPERVOICE),
-	LEVEL_UP_MOVE(45, MOVE_LASTRESORT),
-	LEVEL_UP_MOVE(49, MOVE_AFTERYOU),
+	LEVEL_UP_MOVE(46, MOVE_LASTRESORT),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sCinccinoLevelUpLearnset[] = {
+	LEVEL_UP_MOVE( 0, MOVE_TAILSLAP),
 	LEVEL_UP_MOVE( 1, MOVE_BULLETSEED),
 	LEVEL_UP_MOVE( 1, MOVE_ROCKBLAST),
+	LEVEL_UP_MOVE( 1, MOVE_POUND),
+	LEVEL_UP_MOVE( 1, MOVE_BABYDOLLEYES),
 	LEVEL_UP_MOVE( 1, MOVE_HELPINGHAND),
+	LEVEL_UP_MOVE( 1, MOVE_ECHOEDVOICE),
+	LEVEL_UP_MOVE( 1, MOVE_DOUBLESLAP),
+	LEVEL_UP_MOVE( 1, MOVE_CHARM),
+	LEVEL_UP_MOVE( 1, MOVE_SWIFT),
+	LEVEL_UP_MOVE( 1, MOVE_AFTERYOU),
 	LEVEL_UP_MOVE( 1, MOVE_TICKLE),
-	LEVEL_UP_MOVE( 1, MOVE_SING),
+	LEVEL_UP_MOVE( 1, MOVE_SLAM),
+	LEVEL_UP_MOVE( 1, MOVE_CAPTIVATE),
+	LEVEL_UP_MOVE( 1, MOVE_HYPERVOICE),
+	LEVEL_UP_MOVE( 1, MOVE_LASTRESORT),
 	LEVEL_UP_MOVE( 1, MOVE_TAILSLAP),
+	LEVEL_UP_MOVE( 1, MOVE_WAKEUPSLAP),
+	LEVEL_UP_MOVE( 1, MOVE_SING),
+	LEVEL_UP_MOVE( 1, MOVE_ENCORE),
 	LEVEL_UP_END
 };
 
@@ -15988,61 +16007,58 @@ static const struct LevelUpMove sBewearLevelUpLearnset[] = {
 
 static const struct LevelUpMove sBounsweetLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_SPLASH),
-	LEVEL_UP_MOVE( 5, MOVE_PLAYNICE),
-	LEVEL_UP_MOVE( 9, MOVE_RAPIDSPIN),
-	LEVEL_UP_MOVE(13, MOVE_RAZORLEAF),
-	LEVEL_UP_MOVE(17, MOVE_SWEETSCENT),
-	LEVEL_UP_MOVE(21, MOVE_MAGICALLEAF),
-	LEVEL_UP_MOVE(25, MOVE_TEETERDANCE),
-	LEVEL_UP_MOVE(29, MOVE_FLAIL),
-	LEVEL_UP_MOVE(33, MOVE_AROMATICMIST),
+	LEVEL_UP_MOVE( 4, MOVE_PLAYNICE),
+	LEVEL_UP_MOVE( 8, MOVE_RAPIDSPIN),
+	LEVEL_UP_MOVE(12, MOVE_RAZORLEAF),
+	LEVEL_UP_MOVE(16, MOVE_SWEETSCENT),
+	LEVEL_UP_MOVE(20, MOVE_MAGICALLEAF),
+	LEVEL_UP_MOVE(24, MOVE_FLAIL),
+	LEVEL_UP_MOVE(28, MOVE_TEETERDANCE),
+	LEVEL_UP_MOVE(32, MOVE_AROMATICMIST),
+	LEVEL_UP_MOVE(36, MOVE_AROMATHERAPY),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sSteeneeLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 0, MOVE_DOUBLESLAP),
+	LEVEL_UP_MOVE( 1, MOVE_CAPTIVATE),
+	LEVEL_UP_MOVE( 1, MOVE_FLAIL),
 	LEVEL_UP_MOVE( 1, MOVE_SPLASH),
 	LEVEL_UP_MOVE( 1, MOVE_PLAYNICE),
 	LEVEL_UP_MOVE( 1, MOVE_RAPIDSPIN),
 	LEVEL_UP_MOVE( 1, MOVE_RAZORLEAF),
-	LEVEL_UP_MOVE( 5, MOVE_PLAYNICE),
-	LEVEL_UP_MOVE( 9, MOVE_RAPIDSPIN),
-	LEVEL_UP_MOVE(13, MOVE_RAZORLEAF),
-	LEVEL_UP_MOVE(17, MOVE_SWEETSCENT),
+	LEVEL_UP_MOVE(16, MOVE_SWEETSCENT),
 	LEVEL_UP_MOVE(17, MOVE_DOUBLESLAP),
-	LEVEL_UP_MOVE(21, MOVE_MAGICALLEAF),
-	LEVEL_UP_MOVE(25, MOVE_TEETERDANCE),
-	LEVEL_UP_MOVE(29, MOVE_STOMP),
-	LEVEL_UP_MOVE(33, MOVE_AROMATICMIST),
-	LEVEL_UP_MOVE(37, MOVE_CAPTIVATE),
-	LEVEL_UP_MOVE(41, MOVE_AROMATHERAPY),
-	LEVEL_UP_MOVE(45, MOVE_LEAFSTORM),
+	LEVEL_UP_MOVE(22, MOVE_MAGICALLEAF),
+	LEVEL_UP_MOVE(28, MOVE_STOMP),
+	LEVEL_UP_MOVE(34, MOVE_TEETERDANCE),
+	LEVEL_UP_MOVE(40, MOVE_AROMATICMIST),
+	LEVEL_UP_MOVE(46, MOVE_AROMATHERAPY),
+	LEVEL_UP_MOVE(52, MOVE_LEAFSTORM),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sTsareenaLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 0, MOVE_TROPKICK),
 	LEVEL_UP_MOVE( 1, MOVE_PUNISHMENT),
-	LEVEL_UP_MOVE( 1, MOVE_DOUBLESLAP),
+	LEVEL_UP_MOVE( 1, MOVE_CAPTIVATE),
+	LEVEL_UP_MOVE( 1, MOVE_FLAIL),
+	LEVEL_UP_MOVE( 1, MOVE_PLAYNICE),
 	LEVEL_UP_MOVE( 1, MOVE_SPLASH),
 	LEVEL_UP_MOVE( 1, MOVE_SWAGGER),
 	LEVEL_UP_MOVE( 1, MOVE_RAPIDSPIN),
 	LEVEL_UP_MOVE( 1, MOVE_RAZORLEAF),
-	LEVEL_UP_MOVE( 5, MOVE_SWAGGER),
-	LEVEL_UP_MOVE( 9, MOVE_RAPIDSPIN),
-	LEVEL_UP_MOVE(13, MOVE_RAZORLEAF),
-	LEVEL_UP_MOVE(17, MOVE_SWEETSCENT),
+	LEVEL_UP_MOVE(16, MOVE_SWEETSCENT),
 	LEVEL_UP_MOVE(17, MOVE_DOUBLESLAP),
-	LEVEL_UP_MOVE(21, MOVE_MAGICALLEAF),
-	LEVEL_UP_MOVE(25, MOVE_TEETERDANCE),
-	LEVEL_UP_MOVE(28, MOVE_TROPKICK),
-	LEVEL_UP_MOVE(29, MOVE_STOMP),
-	LEVEL_UP_MOVE(33, MOVE_AROMATICMIST),
-	LEVEL_UP_MOVE(37, MOVE_CAPTIVATE),
-	LEVEL_UP_MOVE(41, MOVE_AROMATHERAPY),
-	LEVEL_UP_MOVE(45, MOVE_LEAFSTORM),
-	LEVEL_UP_MOVE(49, MOVE_HIGHJUMPKICK),
-	LEVEL_UP_MOVE(53, MOVE_POWERWHIP),
+	LEVEL_UP_MOVE(22, MOVE_MAGICALLEAF),
+	LEVEL_UP_MOVE(27, MOVE_TROPKICK),
+	LEVEL_UP_MOVE(28, MOVE_STOMP),
+	LEVEL_UP_MOVE(34, MOVE_TEETERDANCE),
+	LEVEL_UP_MOVE(40, MOVE_AROMATICMIST),
+	LEVEL_UP_MOVE(46, MOVE_AROMATHERAPY),
+	LEVEL_UP_MOVE(52, MOVE_LEAFSTORM),
+	LEVEL_UP_MOVE(58, MOVE_HIGHJUMPKICK),
+	LEVEL_UP_MOVE(64, MOVE_POWERWHIP),
 	LEVEL_UP_END
 };