From 51bb713aef52e5bdaba24dbf34f534654dfd5788 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Sun, 7 Apr 2019 14:39:11 +0200
Subject: [PATCH] Add Burmy Wormadam form gfx and data

---
 .../pokemon/burmy/{ => plant}/anim_front.png  | Bin
 graphics/pokemon/burmy/{ => plant}/back.png   | Bin
 graphics/pokemon/burmy/{ => plant}/front.png  | Bin
 graphics/pokemon/burmy/{ => plant}/icon.png   | Bin
 graphics/pokemon/burmy/{ => plant}/normal.pal |   0
 graphics/pokemon/burmy/{ => plant}/shiny.pal  |   0
 graphics/pokemon/burmy/sandy/anim_front.png   | Bin 0 -> 782 bytes
 graphics/pokemon/burmy/sandy/back.png         | Bin 0 -> 539 bytes
 graphics/pokemon/burmy/sandy/front.png        | Bin 0 -> 517 bytes
 .../{wormadam => burmy/sandy}/icon.png        | Bin
 graphics/pokemon/burmy/sandy/normal.pal       |  19 ++++
 graphics/pokemon/burmy/sandy/shiny.pal        |  19 ++++
 graphics/pokemon/burmy/trash/anim_front.png   | Bin 0 -> 845 bytes
 graphics/pokemon/burmy/trash/back.png         | Bin 0 -> 550 bytes
 graphics/pokemon/burmy/trash/front.png        | Bin 0 -> 533 bytes
 graphics/pokemon/burmy/trash/icon.png         | Bin 0 -> 310 bytes
 graphics/pokemon/burmy/trash/normal.pal       |  19 ++++
 graphics/pokemon/burmy/trash/shiny.pal        |  19 ++++
 .../wormadam/{ => plant}/anim_front.png       | Bin
 .../pokemon/wormadam/{ => plant}/back.png     | Bin
 .../pokemon/wormadam/{ => plant}/front.png    | Bin
 graphics/pokemon/wormadam/plant/icon.png      | Bin 0 -> 310 bytes
 .../pokemon/wormadam/{ => plant}/normal.pal   |   0
 .../pokemon/wormadam/{ => plant}/shiny.pal    |   0
 .../pokemon/wormadam/sandy/anim_front.png     | Bin 0 -> 1046 bytes
 graphics/pokemon/wormadam/sandy/back.png      | Bin 0 -> 660 bytes
 graphics/pokemon/wormadam/sandy/front.png     | Bin 0 -> 641 bytes
 graphics/pokemon/wormadam/sandy/icon.png      | Bin 0 -> 310 bytes
 graphics/pokemon/wormadam/sandy/normal.pal    |  19 ++++
 graphics/pokemon/wormadam/sandy/shiny.pal     |  19 ++++
 .../pokemon/wormadam/trash/anim_front.png     | Bin 0 -> 938 bytes
 graphics/pokemon/wormadam/trash/back.png      | Bin 0 -> 620 bytes
 graphics/pokemon/wormadam/trash/front.png     | Bin 0 -> 575 bytes
 graphics/pokemon/wormadam/trash/icon.png      | Bin 0 -> 310 bytes
 graphics/pokemon/wormadam/trash/normal.pal    |  19 ++++
 graphics/pokemon/wormadam/trash/shiny.pal     |  19 ++++
 include/constants/species.h                   |   9 +-
 include/graphics.h                            |  40 ++++++--
 src/data/graphics/pokemon.h                   |  40 ++++++--
 src/data/pokemon/base_stats.h                 |  97 ++++++++++++++++++
 src/data/pokemon/evolution.h                  |   4 +
 src/data/pokemon_graphics/back_pic_table.h    |   8 +-
 src/data/pokemon_graphics/front_pic_anims.h   |   4 +
 src/data/pokemon_graphics/front_pic_table.h   |   8 +-
 src/data/pokemon_graphics/palette_table.h     |   8 +-
 .../pokemon_graphics/shiny_palette_table.h    |   8 +-
 src/pokemon.c                                 |   4 +
 src/pokemon_icon.c                            |   8 +-
 48 files changed, 358 insertions(+), 32 deletions(-)
 rename graphics/pokemon/burmy/{ => plant}/anim_front.png (100%)
 rename graphics/pokemon/burmy/{ => plant}/back.png (100%)
 rename graphics/pokemon/burmy/{ => plant}/front.png (100%)
 rename graphics/pokemon/burmy/{ => plant}/icon.png (100%)
 rename graphics/pokemon/burmy/{ => plant}/normal.pal (100%)
 rename graphics/pokemon/burmy/{ => plant}/shiny.pal (100%)
 create mode 100644 graphics/pokemon/burmy/sandy/anim_front.png
 create mode 100644 graphics/pokemon/burmy/sandy/back.png
 create mode 100644 graphics/pokemon/burmy/sandy/front.png
 rename graphics/pokemon/{wormadam => burmy/sandy}/icon.png (100%)
 create mode 100644 graphics/pokemon/burmy/sandy/normal.pal
 create mode 100644 graphics/pokemon/burmy/sandy/shiny.pal
 create mode 100644 graphics/pokemon/burmy/trash/anim_front.png
 create mode 100644 graphics/pokemon/burmy/trash/back.png
 create mode 100644 graphics/pokemon/burmy/trash/front.png
 create mode 100644 graphics/pokemon/burmy/trash/icon.png
 create mode 100644 graphics/pokemon/burmy/trash/normal.pal
 create mode 100644 graphics/pokemon/burmy/trash/shiny.pal
 rename graphics/pokemon/wormadam/{ => plant}/anim_front.png (100%)
 rename graphics/pokemon/wormadam/{ => plant}/back.png (100%)
 rename graphics/pokemon/wormadam/{ => plant}/front.png (100%)
 create mode 100644 graphics/pokemon/wormadam/plant/icon.png
 rename graphics/pokemon/wormadam/{ => plant}/normal.pal (100%)
 rename graphics/pokemon/wormadam/{ => plant}/shiny.pal (100%)
 create mode 100644 graphics/pokemon/wormadam/sandy/anim_front.png
 create mode 100644 graphics/pokemon/wormadam/sandy/back.png
 create mode 100644 graphics/pokemon/wormadam/sandy/front.png
 create mode 100644 graphics/pokemon/wormadam/sandy/icon.png
 create mode 100644 graphics/pokemon/wormadam/sandy/normal.pal
 create mode 100644 graphics/pokemon/wormadam/sandy/shiny.pal
 create mode 100644 graphics/pokemon/wormadam/trash/anim_front.png
 create mode 100644 graphics/pokemon/wormadam/trash/back.png
 create mode 100644 graphics/pokemon/wormadam/trash/front.png
 create mode 100644 graphics/pokemon/wormadam/trash/icon.png
 create mode 100644 graphics/pokemon/wormadam/trash/normal.pal
 create mode 100644 graphics/pokemon/wormadam/trash/shiny.pal

diff --git a/graphics/pokemon/burmy/anim_front.png b/graphics/pokemon/burmy/plant/anim_front.png
similarity index 100%
rename from graphics/pokemon/burmy/anim_front.png
rename to graphics/pokemon/burmy/plant/anim_front.png
diff --git a/graphics/pokemon/burmy/back.png b/graphics/pokemon/burmy/plant/back.png
similarity index 100%
rename from graphics/pokemon/burmy/back.png
rename to graphics/pokemon/burmy/plant/back.png
diff --git a/graphics/pokemon/burmy/front.png b/graphics/pokemon/burmy/plant/front.png
similarity index 100%
rename from graphics/pokemon/burmy/front.png
rename to graphics/pokemon/burmy/plant/front.png
diff --git a/graphics/pokemon/burmy/icon.png b/graphics/pokemon/burmy/plant/icon.png
similarity index 100%
rename from graphics/pokemon/burmy/icon.png
rename to graphics/pokemon/burmy/plant/icon.png
diff --git a/graphics/pokemon/burmy/normal.pal b/graphics/pokemon/burmy/plant/normal.pal
similarity index 100%
rename from graphics/pokemon/burmy/normal.pal
rename to graphics/pokemon/burmy/plant/normal.pal
diff --git a/graphics/pokemon/burmy/shiny.pal b/graphics/pokemon/burmy/plant/shiny.pal
similarity index 100%
rename from graphics/pokemon/burmy/shiny.pal
rename to graphics/pokemon/burmy/plant/shiny.pal
diff --git a/graphics/pokemon/burmy/sandy/anim_front.png b/graphics/pokemon/burmy/sandy/anim_front.png
new file mode 100644
index 0000000000000000000000000000000000000000..0819e2b4c367cf3018d453208d1318d644aff04e
GIT binary patch
literal 782
zcmV+p1M&QcP)<h;3K|Lk000e1NJLTq002M$004jl0{{R3Nw0EQ00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj5Fi=cXMVQc_C@3(9h<G?SI9OO<5D*ZEfLQR@kYG?y
zu$XB0$S|OQ7+`2{fS8!@*pL7K09_<wdH?_b32;bRa{vGi!vFvd!vV){sAK>D0%u7?
zK~z}7?Uv1M(?Af%*J=`(TN~0BFn$2&x~eMm0QIC&BOxJLBR;NaQgaPtu+#$=8u?6P
zvr>+5%8id_s3N5&Bu>e@u(r!BGjrlnWv=tn{%2Ne`KRt?Ihz8|6o3s704Ed@9Q}|7
zYJQsscKmHV!F%$I2Vjd&P+I~}I~4BW&;xb`#}l@6K=VteD2mwrMgY4ku;T+eq!S$V
zx-8J^<M1&9oF|B8_>t`2!+}P`4<s-e1fX+7>IfGD4`7c0-hK~YdW;E`(P;nj;dN-I
zAT~`qCmN<45VWD3;XM&C>Oug}M@&|q;9_<K$34u^j0pgfp1lQonV*P=qKOG6iCLLZ
zyRQ0(`D)<l0;{4<_y^><`Lc3^S_RA#Lu^s|Q{-PPXB41PW0#yP_Kl&gIySZrjEM=L
zZp?gEFhqg{Cd=QpA5(xzKQ9->0p!E4$9fi%BieFJS@g44kx7kVzuxF2-?w83{dKKt
zUH_}Lh5miPVH^<t?oKEGEg?beo(KtoqNt`X%+LxS38JM1k8+y+rZ9u#QK0z*2zlRh
z!ay)mt%1L5?eV~dCv4I3g@owz=$r)_R>iu^AEz-IA`Y1|`c}ml(Nb<wsMtR3YNJxc
zLIxO2A3)~^=2S-d?#**(f9+F4xOwnR2c4gLlxbNTgwxW+NZ<-W3*<PaB9a&&i;=LP
zQnYN_YEm*LfvPB(yST1Iiag<_G^yOG+8GDfA+ps&rZ<)D%_&Q9Cs^p@#JU&(Sbwn_
zSQn!_>9UfXgNy=RnOhg5UjB>h*2O5Go|?kNvNJ_h-IOkN=TuCozi5vQ%g&jkmH+?%
M07*qoM6N<$g63>jaR2}S

literal 0
HcmV?d00001

diff --git a/graphics/pokemon/burmy/sandy/back.png b/graphics/pokemon/burmy/sandy/back.png
new file mode 100644
index 0000000000000000000000000000000000000000..494ef54471dac0f37643cff3c7409211f3230760
GIT binary patch
literal 539
zcmV+$0_6RPP)<h;3K|Lk000e1NJLTq002M$002M)0{{R3SVwH_00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj5Fi=cXMVQc_C@3(9n6NlNSYU975D*Z6aA4TTcwkUa
zsE}~@&`6kwC}3!4fQX3D$anw%01%+}p#T5?32;bRa{vGi!vFvd!vV){sAK>D0dz@3
zK~zY`-IP6Q!$1&))d+MCU%;>~?7~ef_XcIbx{Zqj<VFO9Km%s)6R<0{QE8BxIYV}3
z{e`^UZ9}G=Z{NK6VS~RGp_EHEAXYm!k%-m8BO!J^6N#_H%hC;aOn3p~Vee6hg-bvP
zw@U+vc;N!1l&>zAQY-8a4j>WhEOt#wuFv%5=rg30xREDY{yilk=Df1xGd6%?<_zW|
zrY;n5P7r9R55*0XNC$u!+KkSV!Vv*Eje$#y0;UmABceI*;S#X4k<Ng&1vQRy1x3Gi
z9@38hfHv_p0VibQR(}rpG5{qmb-gjkD=u-Q;t5>pD+F|#+q-$Yt#zdeS)gJw0?<Pr
zMSaI@jvb1P2k2&v2Q|&QIzX3`0=k$vpb%izdF^Md(A9=!i2b_oS*Lmg9iUo#wYtWw
z8@A#c0^zU?<_3Qv>2n+Us2?yt3{&yL@(YFiC>rZ8Wq^uE+VX*<GLz@hn%7^o7MHGX
d@SjEyd;_u(G$^y{&!PYT002ovPDHLkV1jo>-d+Fz

literal 0
HcmV?d00001

diff --git a/graphics/pokemon/burmy/sandy/front.png b/graphics/pokemon/burmy/sandy/front.png
new file mode 100644
index 0000000000000000000000000000000000000000..4dadea3dfa5843b2b93ba1fea746a0fa85ac02f8
GIT binary patch
literal 517
zcmV+g0{Z=lP)<h;3K|Lk000e1NJLTq002M$002M)0{{R3SVwH_00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj5Fi=cXMVQc_C@3(9h<G?SI9OO<5D*ZEfLQR@kYG?y
zu$XB0$S|OQ7+`2{fS8!@*pL7K09_<wdH?_b32;bRa{vGi!vFvd!vV){sAK>D0bWT&
zK~zY`?UT<+!$1(mH#C)cvw|-W@&MATh~PonsZc=>Bp{wkYP=RZE_m=FC1?M{fxba+
z1)o6*y$PPucX89=Ei-!*#P9n3nD3imSN%<STMl5`0o1?&cpXQA7wyV`A9iJ+74FCh
z!ST5aKvPaoO$Xq&9d~F4Aa?Kq$Ce&M@)9bJW6`f^*b{+P2x3W3pCo+|NCr4M5`b%i
zNTUbV-^5{rh<7Y79%_hkL~cX_bpWt005>xY(;gZwW25^X!d1t%U^dN8FCv&qfbPPo
z!z~jr?t=yxAe!n44SaouUV=H&3j?4@>=o=WADM{KM1#gqWrqK;_7U@H;H<#4xCuW%
zp3_@p1%C}J3^7~yUuFLNa?SxNBfI3JI3VIqos!idQOW>yqQ$&qm;?(<mY>#7IY4Dk
z%c2~>KKyzb%~Q6bRfAUIpS_AHBNBgad@1|3hQt5Y?@6g|mhgp&aV!AO00000NkvXX
Hu0mjfh0V|U

literal 0
HcmV?d00001

diff --git a/graphics/pokemon/wormadam/icon.png b/graphics/pokemon/burmy/sandy/icon.png
similarity index 100%
rename from graphics/pokemon/wormadam/icon.png
rename to graphics/pokemon/burmy/sandy/icon.png
diff --git a/graphics/pokemon/burmy/sandy/normal.pal b/graphics/pokemon/burmy/sandy/normal.pal
new file mode 100644
index 000000000..498bc6ef4
--- /dev/null
+++ b/graphics/pokemon/burmy/sandy/normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+40 40 48
+136 136 120
+56 56 56
+88 88 96
+16 16 16
+136 128 88
+240 216 144
+96 80 80
+176 152 104
+248 200 48
+160 128 24
+96 104 112
+128 152 152
+240 216 144
+0 0 0
diff --git a/graphics/pokemon/burmy/sandy/shiny.pal b/graphics/pokemon/burmy/sandy/shiny.pal
new file mode 100644
index 000000000..5888821a0
--- /dev/null
+++ b/graphics/pokemon/burmy/sandy/shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+40 40 48
+136 152 176
+56 64 88
+96 112 136
+16 16 16
+128 112 96
+216 200 120
+96 80 80
+168 144 112
+248 208 72
+152 136 40
+96 104 104
+128 136 136
+208 200 120
+0 0 0
diff --git a/graphics/pokemon/burmy/trash/anim_front.png b/graphics/pokemon/burmy/trash/anim_front.png
new file mode 100644
index 0000000000000000000000000000000000000000..d24fb3427630992b95d9119382f1cb8309510cf1
GIT binary patch
literal 845
zcmV-T1G4;yP)<h;3K|Lk000e1NJLTq002M$004jl0{{R3Nw0EQ00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj5Fi=cXMVQc_C@3(9h<G?SKv-B{5D*ZEP*`9<NWf@t
z=%A4J$S|OQ7<hPqsIag&I5>b%P<|f;ZU6uP32;bRa{vGi!vFvd!vV){sAK>D0;Wks
zK~z}7?U%i8(?Ar!&q`fysEyK<A@~odYPU*J7}~r@s6%8?tXd$Lni6kFsERFh3r_A>
zBa*uvrfhut1szz*6m??&30D6N+$9npQr^2A`quaJ`#4MIpV_||&V~i3T7U{z0H<Z?
z-~`(=u;#aEV8`F0JJb&%8h}l@1KYF!YloI|IIIIXgHyL`=|Dg)!Qwb3^OX>GNnpnZ
za!6<IEa+1&Yh5U=Mns8JndqbWo*D=Hn!rkUY8*mKDD@fvauwDA8cKCB;MKbjX7}+P
zUh&a~M=cE$NQJw{0n7}543URz05EGzS9egSptm?v*bttSI=`m`3JB3tLzPOU<Vqly
z6aB1^8hFNVz~qrFa%FN-;X|t5VFOkV$+BMncGM;(rb3PoAe)-%&5U#GZC+%0%jOFd
zV9iVj(Y$J4z_CtAIcUz25!^4A+{9px6mYMjWN3gV+Ze#ySOXCOFm}Sbtiq5mt+O5{
zF9?q(SwR7A;TA)(MC6X>D@I>J>?UsF|BEe4{<g(o9I$-dosI>lSvs&EPc0oRio&YC
zWrkYkn?<xri$^(Cf5S3^&7+{CJ3!|v4RpSjG*Om7pLJQMfm?OU7B&B%PXZ_XTs<f9
zp80f6anV{&wP^`lv{)*&X=wrzE&X+0npS}V<JlcJdXM+WUp{^S?Kde_!c*bfAUyi8
zj}4&#c(_olDbitb3N3(EiVcwqZCW}nF(6aMw9<)osnvidm!2d9GQ$$kc~lpd3M5cX
z$}OVxM+HubR;Dlw^0*PH@h8r)cfl`m12p*gYJg=%qy|@)sDx;dl2Qhr8<-~<krJHW
z!+uiS>ttbCyK@w97eI^yOpDeqX6R2$#JnLVEs15th!(9RN|G)GxGXuhT;}fIdB%PM
X#5^}A^J`A%00000NkvXXu0mjfPg!JU

literal 0
HcmV?d00001

diff --git a/graphics/pokemon/burmy/trash/back.png b/graphics/pokemon/burmy/trash/back.png
new file mode 100644
index 0000000000000000000000000000000000000000..9725be4facd9fa4162db478328dc5bd1f2661e67
GIT binary patch
literal 550
zcmV+>0@?kEP)<h;3K|Lk000e1NJLTq002M$002M)0{{R3SVwH_00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj5Fi=cXMVQc_FgQSnn6NlFKwxl)5D*ZEP+(v{NU&&l
z@Q|4J&`6kwC~$aqn5d{YKv;-SU@>83xc~qF32;bRa{vGi!vFvd!vV){sAK>D0e?wE
zK~zY`&6Kfj!Y~kqvsir_9-@L3W#Ci~A!4DT4}i$nCFJ}7MEHT&+Ob=a80hL}sLv#!
z5oh1pQ!*s}{Qv*Ov9teH3gD6k+;yHNN_U+I5^gSqC?$*MOBxVDhyZ1n2?|q}5^ye^
zk^ncIqyPX|q*8)cnB@te{DE?s`cj~Ay-4(_G@@zO@%eyww6<Nv#<BJS#=aeSLRpJm
z!AsaS0$`{ppgX`sf#U$MeW(}2!Q+(!`f)E|EYrsz5Ri8!!XE&+m?OYQ0M-(~w6T*E
z)Ce$-eLi`Q4UKIg0A<+haeo6W4^#wHJU|ir?1of)wQR-)t8lSh5J2<kjso`#HM4ni
z*J5Y_W57_%|DeQAJ(4(Ng2zFyFe0!LGH?K$4MTDJf_8Ubd;SzEbg!{JapUTvH`x}S
zoJ4Wze%x)Y&Jln%a07X!&R>iJ$tt)l<dOl3@J`>>Nqs+hEa{bMbR8t%5rE)R>z!tn
o`W^%@SCFL$OdaJxV*H$Czh}HZWj@#oLjV8(07*qoM6N<$g6pT{i~s-t

literal 0
HcmV?d00001

diff --git a/graphics/pokemon/burmy/trash/front.png b/graphics/pokemon/burmy/trash/front.png
new file mode 100644
index 0000000000000000000000000000000000000000..585d072381718b5c4275f6d794a531c79c1fa0e0
GIT binary patch
literal 533
zcmV+w0_y#VP)<h;3K|Lk000e1NJLTq002M$002M)0{{R3SVwH_00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj5Fi=cXMVQc_C@3(9h<G?SKv-B{5D*ZEP*`9<NWf@t
z=%A4J$S|OQ7<hPqsIag&I5>b%P<|f;ZU6uP32;bRa{vGi!vFvd!vV){sAK>D0d7e|
zK~zY`?Ub=f13?gm_ejobjo=F$_W&VxhA7vVOu+IW90tM8Xi{5b5A4DvyS72I^9<<(
zpTO2G*!eK-Hd>gO?Zv<Szn%I2U0Crq6&!kiBM;C34-gDI8-ldW1I=W}1D)iU-w>Y{
zJOC|zgJ^kxX5VuU{TSE`LF{Q6K+2a8Wm&R*BZCtb=p?{~47#`JoO`STjS5%Hh#5M~
zNq>s#^wbj6hzQpi3^d{s0aTd906oMB1w6iFu)UynMD=R|R|5;w#Dud^3R?#dA*yT$
z0ItSn{|3AP+u|0f5Roy~@1iCFt*5xenL#vrfyzAFv)WkTPSAk!i53+)&mbKVf8+!9
zhZOP~psw0^dZW#X0OZC^&!tk-Yd%QZGQTGQkxQ+0{@$a2k+qCj<U1ll`1z)s7CT}<
z_)(0P4!CYpfCx(q6bvB5rJ9I_AmmodsbW8fNR4I90bw21OLjyNuJ|v;enR43za_*M
Xj|ZH3)jsnl00000NkvXXu0mjf{TkZL

literal 0
HcmV?d00001

diff --git a/graphics/pokemon/burmy/trash/icon.png b/graphics/pokemon/burmy/trash/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..8f6ca5dde3b929e97a723a19e0c15012385f0548
GIT binary patch
literal 310
zcmV-60m=S}P)<h;3K|Lk000e1NJLTq001BW002M)0{{R3iJ)km0000mP)t-sVw{6>
zb924Dz5oCJdz?y~%}SK^O73%<_LTO$q+0goDfafP)zxa|N-1JuT0ucUX*qpc00001
zbW%=J06^y0W&i*Hv`IukR5*?8(lH9cKokVfoFIFclxepS#3ueqZ>H!WB!x`CCS3--
zf~^pi6s9tTYnA`g1+2vB{#&M4m?ZhVxNdUq&Q^v~elyS)`NcG(K-C$5g#l7-j|yH9
z);9xy*DwewYG|b*uL@Gq^R8h}ztE5b*1`TROzwYXXZB#6WVxBcQ!+r$q2B<aI<A30
zmSe}oca#<Ya)h+`3`XxE4yN{cFb}f!2L)+Mu2dsR2<HBB-hk#|J4G_I4*&oF07*qo
IM6N<$f`*WVmjD0&

literal 0
HcmV?d00001

diff --git a/graphics/pokemon/burmy/trash/normal.pal b/graphics/pokemon/burmy/trash/normal.pal
new file mode 100644
index 000000000..68533a009
--- /dev/null
+++ b/graphics/pokemon/burmy/trash/normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+40 40 48
+136 136 120
+56 56 64
+88 88 96
+16 16 16
+136 80 88
+96 64 72
+192 104 112
+232 160 144
+248 200 48
+160 128 24
+120 120 128
+168 176 176
+56 56 56
+128 80 80
diff --git a/graphics/pokemon/burmy/trash/shiny.pal b/graphics/pokemon/burmy/trash/shiny.pal
new file mode 100644
index 000000000..eba194bd4
--- /dev/null
+++ b/graphics/pokemon/burmy/trash/shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+48 56 64
+136 152 176
+56 56 64
+96 112 136
+16 16 16
+136 80 96
+96 64 72
+176 104 120
+240 144 152
+248 208 72
+152 136 40
+112 120 120
+152 168 168
+56 64 88
+136 80 96
diff --git a/graphics/pokemon/wormadam/anim_front.png b/graphics/pokemon/wormadam/plant/anim_front.png
similarity index 100%
rename from graphics/pokemon/wormadam/anim_front.png
rename to graphics/pokemon/wormadam/plant/anim_front.png
diff --git a/graphics/pokemon/wormadam/back.png b/graphics/pokemon/wormadam/plant/back.png
similarity index 100%
rename from graphics/pokemon/wormadam/back.png
rename to graphics/pokemon/wormadam/plant/back.png
diff --git a/graphics/pokemon/wormadam/front.png b/graphics/pokemon/wormadam/plant/front.png
similarity index 100%
rename from graphics/pokemon/wormadam/front.png
rename to graphics/pokemon/wormadam/plant/front.png
diff --git a/graphics/pokemon/wormadam/plant/icon.png b/graphics/pokemon/wormadam/plant/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..8f6ca5dde3b929e97a723a19e0c15012385f0548
GIT binary patch
literal 310
zcmV-60m=S}P)<h;3K|Lk000e1NJLTq001BW002M)0{{R3iJ)km0000mP)t-sVw{6>
zb924Dz5oCJdz?y~%}SK^O73%<_LTO$q+0goDfafP)zxa|N-1JuT0ucUX*qpc00001
zbW%=J06^y0W&i*Hv`IukR5*?8(lH9cKokVfoFIFclxepS#3ueqZ>H!WB!x`CCS3--
zf~^pi6s9tTYnA`g1+2vB{#&M4m?ZhVxNdUq&Q^v~elyS)`NcG(K-C$5g#l7-j|yH9
z);9xy*DwewYG|b*uL@Gq^R8h}ztE5b*1`TROzwYXXZB#6WVxBcQ!+r$q2B<aI<A30
zmSe}oca#<Ya)h+`3`XxE4yN{cFb}f!2L)+Mu2dsR2<HBB-hk#|J4G_I4*&oF07*qo
IM6N<$f`*WVmjD0&

literal 0
HcmV?d00001

diff --git a/graphics/pokemon/wormadam/normal.pal b/graphics/pokemon/wormadam/plant/normal.pal
similarity index 100%
rename from graphics/pokemon/wormadam/normal.pal
rename to graphics/pokemon/wormadam/plant/normal.pal
diff --git a/graphics/pokemon/wormadam/shiny.pal b/graphics/pokemon/wormadam/plant/shiny.pal
similarity index 100%
rename from graphics/pokemon/wormadam/shiny.pal
rename to graphics/pokemon/wormadam/plant/shiny.pal
diff --git a/graphics/pokemon/wormadam/sandy/anim_front.png b/graphics/pokemon/wormadam/sandy/anim_front.png
new file mode 100644
index 0000000000000000000000000000000000000000..7410c9ad28ac335184bd73c44aa4491994b9432a
GIT binary patch
literal 1046
zcmV+x1nK*UP)<h;3K|Lk000e1NJLTq002M$004jl0{{R3Nw0EQ00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj5Fi=cXMVQc_5D*YpSYS9fIEaXNI4~Hfh*)@7FtDI-
z`1tssKse~oh+tq)=x|tgcvt`c0GyjCm;e9(32;bRa{vGi!vFvd!vV){sAK>D18+%0
zK~z}7?Up}l+dve+rNMOZ5Xp`0l2Xt)-D9^yXX7QC-EvYOlLwz>5Aw~T1RhZuDD*=F
z3lAO&hp(7+GuWTN;K5rUU!w2gP!j#SAuVkoZ_wcT>E3(7@9t;(mtkqvO-BRRj|EI}
zqyZXxniLgXijEFwH#I;@SA+f6fl}8#!bd*f4q8oo6aYcXF}wo68xp7F=cOpo68%6N
zm*wnGa+%9*(x@>`vzEK=VB}XiZPMfcqZzLcnC}h`I~_u5uFq3tU}DC-N~hCq5y#`b
z-d+muJx;B|HnE9AgDUH%03J{{CWL$;q)taH*{c`u69_*e@B)F5kA{f>dd4Y0cx<a3
znh<jCvP2d8C+D%Sa0kb#1JnYR1j=x}79k_n8-OvKQRWX5Ks4E0g{)tPXf}zV%6I}W
zmXl3fWp$A9e6tp{fcFwR$k{rs_HkW)+N`n6<fkf2IhJ8PLSVMJ0<e;w5&?N5)CNcb
zz=e^FmAtuK6=NyHbp~LpZe~|1!CK1b0<!+x2e>wiWh@2!$ULb`+<k)Y3%Si64l}|A
zHnEIWIm1&{9j;@!g1qTkVu#p6RtLLS%&`Cvm$~CvUPKZifc*Jg;3vG)17Yqu{%fuQ
zwnZnzO0$khE;UDxsk<(o;wgT2n2)_UP4Za4Zs<zT_=A3Ow1)A#tpjwPq|+q5?EP_o
zDxkn&O00`IILcR)(x6)*dqoaIyEfT#gMt*aMfMrXEyDGOgfvIF8ibbgwu6?#gKUCQ
z&qhZf4tEC`1TC?k*SM9KebkZkI;%3j=iExnK2KW?mfmOl{Z3+DdnwB?2O~D*fxVL$
z=Zubg|H1WM9q?dCPwd?ej*^(*!5&q==G6sMh>AviXF2x)Y~4DQ5ZX4eEek-_0yL|8
zIZQqT<qaRJtnv=dWBIkm{QH1m*44cngR3lNypH6Qd%=TF%eU?#r~OkYP<JFIc{pQb
zWj|vC@OD-TAg75LEGs#|-ziFnk_h?TNCCeBH6#rf2X~Squ?IPqA_bVQuur8?6ZQTw
z;{rEjgll6tLks$5WsUGl+<m4Rh~_z`2!5=|Mrlx<AS@Ly#tNqSz-*k^;$4(gry#^U
z_mEiuT2K^4`5FW&gwOy`a8xc(l8P({RSPv~YZMW%wTcf)OLyV?gJBpy0gE}G?~#4W
Q9smFU07*qoM6N<$g1sZn^8f$<

literal 0
HcmV?d00001

diff --git a/graphics/pokemon/wormadam/sandy/back.png b/graphics/pokemon/wormadam/sandy/back.png
new file mode 100644
index 0000000000000000000000000000000000000000..45ced1e810676f51687ff32abe3fe9c3620cd520
GIT binary patch
literal 660
zcmV;F0&D$=P)<h;3K|Lk000e1NJLTq002M$002M)0{{R3SVwH_00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj5Fi=cXMVQc_5D*YxaELfSScssoI4BsXcvx^qFsP7l
z`1tsUNI1~Ia9~hS=x|Vga9{uc02UZ*%K!iX32;bRa{vGi!vFvd!vV){sAK>D0qsdd
zK~zY`)s!)At3VKjcMJC(A|96F#+w`<!8eF=0J|Whb>XG;7R%IhE0N2*4ryJy*F{PW
zl>zKE!QgGu<S#61_v4>`1~KfX#iu@C;R99=9^lzigWoTFz{(RMe)80a#dUx$;krQ}
zJRyVorw5ONXAoR?Lb71VJizML1L3*>aO|Grt_CJ@e;wd?HU^}s0f-wBOj&R@1z3+c
zL^~b}Ksg3Pm~Uc1zr#S1M2Jcdpd#Fd7f^^&p#niAqFiouw(dQ?(Jxs9u@DO&r>&N|
zE-{gEi#mlsknRZ3D5dW9mq<y+HwyrQ9%}$)cN!_`d`k)D*4qEDq!^SpOu7K-4Z?@5
zbs!r8{>UtG2@|9zz@AhQpeRMQKP8l80i^@10aTif+eUaoeWNlCs48Q~BbQPgM?^gU
zn93QH#uStyKLX9)nK5PAaWHg>i34;>KvlIwecb}s0=)h^Yffvzv?}V;_B)-_Q+PE!
z73s;KsiDk;LR6;@oks|lKml$W@nYbf2=^wq8Pw<bUCjo8&Z^<__ueHn`)wcgiqK5q
z`@U>}vrT1ttBk)FU7#!vtS6X)`E>D1`<Gn`ZqE(Q{|x}#4tCf9J}TGb@U{i}cFcHS
u!#a-Z4aU~>>{^1Rh7aJaMZtbjjC}#GpGBq=e|@k30000<MNUMnLSTZJLKc7k

literal 0
HcmV?d00001

diff --git a/graphics/pokemon/wormadam/sandy/front.png b/graphics/pokemon/wormadam/sandy/front.png
new file mode 100644
index 0000000000000000000000000000000000000000..ecf9b7964669d18dc63f820fb0ce7a46912df3b3
GIT binary patch
literal 641
zcmV-{0)G98P)<h;3K|Lk000e1NJLTq002M$002M)0{{R3SVwH_00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj5Fi=cXMVQc_5D*YpSYS9fIEaXNI4~Hfh*)@7FtDI-
z`1tssKse~oh+tq)=x|tgcvt`c0GyjCm;e9(32;bRa{vGi!vFvd!vV){sAK>D0oqAK
zK~zY`?UlW1<3JF{r9z}}5y`~Xag{cCfY|p2MoqeyW2Lk%ysBNuTdN2RR$>U;Ll_J9
ziv|v^Gel1yP?0X+m$>nzTT5QJD~^MkVw?YO=Zl?L>z_2&pxc1~@ctCA*{uP%zBGjB
zn?i&pU@|fQV^a>^Uk99f@0N~kAexUybesXwabU$~fOx?IC+P~|aEE_oK_ognIFX2?
z$F7G$@;3QCnlF=nIAJ513f^*kE|O?*6NZcpqePyhL4k#g`(Zd4vmln!>E#KK#FD!=
z6XvmirvouN0c6VIjxqL)F`qAmUTd7n2gqIs_(VV^mkVuxE+hxY?!2Ri5oA(ELd)Xn
zVO1!XJOr)}FieFG^k7x1OfdHgz!o04NERB9@0v{}W<KQQu7H7%8eqNdnqnY)KwLGo
z8m4lpdBCzR1~by}xv42ly;VKLEoOdBK-p{nT)mY9;6WW75D5TJmTnaueyM7UO1-xL
zR&^*h#{e~A{se80`!i`}fdwk~(YmQ@^1h?{3g6m?!_KLIrog=F7@pp-!n(i;x~A)u
zDx@0PD)_MdcS-=%x^p~x`y3$$=$_v_wQy|)vQC{|%{#!`xeZYnbPBRItRUO;UHrG-
bG|T!4qSnVJqU(x>00000NkvXXu0mjf-`f+X

literal 0
HcmV?d00001

diff --git a/graphics/pokemon/wormadam/sandy/icon.png b/graphics/pokemon/wormadam/sandy/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..8f6ca5dde3b929e97a723a19e0c15012385f0548
GIT binary patch
literal 310
zcmV-60m=S}P)<h;3K|Lk000e1NJLTq001BW002M)0{{R3iJ)km0000mP)t-sVw{6>
zb924Dz5oCJdz?y~%}SK^O73%<_LTO$q+0goDfafP)zxa|N-1JuT0ucUX*qpc00001
zbW%=J06^y0W&i*Hv`IukR5*?8(lH9cKokVfoFIFclxepS#3ueqZ>H!WB!x`CCS3--
zf~^pi6s9tTYnA`g1+2vB{#&M4m?ZhVxNdUq&Q^v~elyS)`NcG(K-C$5g#l7-j|yH9
z);9xy*DwewYG|b*uL@Gq^R8h}ztE5b*1`TROzwYXXZB#6WVxBcQ!+r$q2B<aI<A30
zmSe}oca#<Ya)h+`3`XxE4yN{cFb}f!2L)+Mu2dsR2<HBB-hk#|J4G_I4*&oF07*qo
IM6N<$f`*WVmjD0&

literal 0
HcmV?d00001

diff --git a/graphics/pokemon/wormadam/sandy/normal.pal b/graphics/pokemon/wormadam/sandy/normal.pal
new file mode 100644
index 000000000..009475503
--- /dev/null
+++ b/graphics/pokemon/wormadam/sandy/normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+16 16 16
+88 88 96
+56 56 56
+136 136 120
+56 48 24
+168 136 88
+120 88 48
+176 160 112
+248 248 248
+160 64 56
+232 208 136
+96 96 80
+232 112 88
+120 120 88
+0 0 0
diff --git a/graphics/pokemon/wormadam/sandy/shiny.pal b/graphics/pokemon/wormadam/sandy/shiny.pal
new file mode 100644
index 000000000..b46caaef7
--- /dev/null
+++ b/graphics/pokemon/wormadam/sandy/shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+16 16 16
+96 112 136
+56 64 88
+136 160 176
+56 40 24
+168 120 88
+112 72 48
+168 144 112
+248 248 248
+136 72 56
+208 192 112
+96 80 80
+232 112 80
+128 112 96
+0 0 0
diff --git a/graphics/pokemon/wormadam/trash/anim_front.png b/graphics/pokemon/wormadam/trash/anim_front.png
new file mode 100644
index 0000000000000000000000000000000000000000..cdaa7fb026bb5c2ea37ec1abb641253271da0ce8
GIT binary patch
literal 938
zcmV;b16BNqP)<h;3K|Lk000e1NJLTq002M$004jl0{{R3Nw0EQ00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj5Fi=cXMVQc_5D*YpSYS9fIEaXNSSV1yV4#>lfN(%i
zuwZET`1tUUkN^Mx00000000000O8m91^@s632;bRa{vGi!vFvd!vV){sAK>D0|QA!
zK~z}7?Upfb(?Aq}Z6T{2eHY@^bn>|iOeA!HG4jOJAlXsX$wIlXX24mSt*1;LBK&j{
z5`Q2<NLcshc$ZMo#P;1#gaGwrYTkG6-M!Sl&-o{VSn_UU0q8>km%X$Av2SV7v$aTU
zz-V9rhPFM>zX7mJ(ivKgIUYuimv-m9oJCHS8-VvL@)jn5vbaCF>;`(thz-VF|CU}l
zKTi_IP8Q?VVH{<gUL?to4JJkIx8@0@38O4ZGu}cJd|AF=jD2BoxaPcZk|UnO<}(7%
z5P*zxzX1rfc|&!DfrLr3MD{_}l8hLONT}*hjS?;vfV$+2yn<S(b;gVR5&;6T-tb(?
zT1f?2G21UeNGO#Ic&I>01j_03u*a=bD#)eM1-3wNa1Mdre+v}?Y6l$tA_DZ%UDN=i
zG0I~QcL0EZ%4x(hyjx!3=cWlbVO8S>R^K&HwE^xDXP|^$-<n4PC$Oq2u{>?hW0MsE
zAi5u}P}JCA+?jV=JfHy6(-|VMHsqZ?fT@EX1&GSf!o?jJ_uxVZx235C31Mk|#Smh9
z1wF=N{N`{UdM~={p#Y6-Td-WLj%yVyn_)a1*#Mg-*)+*6dw&8jkJ?M0#C~c5c#rkD
zK`^`-WhaGURNluS>rZ^c7RC$}rMtysevz>Fq~E!IK@+r`XhB+Qq}gH~BQQkEnYR!r
z=d*cqK0=A<FIpT1^PInXyOo&d_{SmP>HL)LBqnN66jTzPU-fns2GCFxZ-&5GjgEs6
zhqBHNN}!Pxxsn@786^a5MoWyp2W0#j-Q#P(d#}+WB%0LpehF{Nr&>O+^jVEpd<|uh
zW%o;v+15_vCcjo&0D^2^VhCveKtO3z(Lk{O5FP_)dr;)3q(E?Ry&+J+FUP5x*Q2P2
zymK79enrDEj&EF8=`N@k2;4d?aT=<f#FXuMy!_QpV#=<!h$~lEpz6M!T`3S)8=ecT
zD8l3iu0G<W3Ah4S`^E|=F-rq*s%L20Lx>V1j4iapIL7!dCB|`n0Jt1gj%*UnT>t<8
M07*qoM6N<$g3zLxB>(^b

literal 0
HcmV?d00001

diff --git a/graphics/pokemon/wormadam/trash/back.png b/graphics/pokemon/wormadam/trash/back.png
new file mode 100644
index 0000000000000000000000000000000000000000..2820cb3f08e365cea668c7710f7f0d4d12ea18f0
GIT binary patch
literal 620
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e#^NA%Cx&(BWL^R}Ea{HEjtmSN
z`?>!lvI6-A0X`wFGcGI;5D-Wx=&*2z=vc5JK*M1}!h{Bof&zzt4H*?be*E|_V*yYt
z9K`O}769aM7I;J!GcfQS24TkI`72U@mL2tUaSZV|es!v0&|w1s*QH9%r)PQQcyaR`
zP%&4KQ4sOV2#(16Xz=aYt81!rOQTh88+PR`Ol)hr|IfU>K5W{de^GzTSe7Uz{1;(}
zV>14cEXDM#QRw#b13hbhNItOsVW}Y0IO*c!&%p|c8#wfsR3o<}Gba4M&nVL{`+Mqq
z?>7yzt-dp4a4=u_^oBV=ZjtTuPY+%SD5qU?j`6-<IHRLTJ4r|Kv)h#0A|D^HGI&pX
zwEBFVsU62gyVS^S3F|j8owinFQAlds9J{tp$bL<J=dN|#-*@(xE3r1bVB9d_)2s+t
z?llfemTXnK(P*L-bKqBYlUwvw2Wf8$!DllHe3$5FO=X><Y;3*m-U>;^yY4;Q#@fd&
zaT+*?7nU&@>}1>3@#mXR!6t{#wu@9x<s4y1nYz-!CHME+@5XIHg*QVD1ee@iwz=1A
zr_H=}&SlP?!MUG)F@+SSTKh3po?&P3^KOu0G<McylD7QkBdX8vfT431^RlBq9vqxB
zcfx0dPn?rVl<&N6yv(zsE<nA(=--nv$3-zr31z<-Jhm?0Ut!7kC6#&J>C?02GPdyV
zc%Pne)W(bL!0#w$c9XT@FScK-F<Sqtwf*1Rdi7)b81}YleQ*rbX#hpJr>mdKI;Vst
E0359RKmY&$

literal 0
HcmV?d00001

diff --git a/graphics/pokemon/wormadam/trash/front.png b/graphics/pokemon/wormadam/trash/front.png
new file mode 100644
index 0000000000000000000000000000000000000000..48670cbf82971e283e9490a61b6d572df96956e8
GIT binary patch
literal 575
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e#^NA%Cx&(BWL^R}Ea{HEjtmSN
z`?>!lvI6-A0X`wFGcGI;5D<unNU*T5=;)}3&<Hq?uwaHmLxDrUhJ=hCKYo0eFaf9*
z4jx|r$p++b7I;J!GcfQS24TkI`72U@md)^VaSZV|{&vbnzrzLsZF3iDCC^>Oy7}p;
zBQD&+$y3=EIA6AOGF_wd(ra7PT&s{LPdGcpUo^Blo&MPA>O$Wn?+pz{QcwTC`?q}h
zjW_;m-(NUBVLUXSi7}?K!SQ(V#jlY^>=JCgFeu0KKg?&anVq71e#Yd$BT<*r_D*#=
zGU*EA9p@`iI~oMo_TG#&zR-KzV2;V(X=`6zc9mhCqo=m@bcVXop3cXDJn50QR$i@?
zI40m^;+w)d@nlUcCqur0fV8Ie<SnUPx5JsvaUO6v<;NOORxLeEv`s4gs?f>BX0!Sk
zmGstBuAIWLf??KHmb%_!w|td09~P=*+H&($NOtnpqbk)FItO=N2>ZTtLxw5i>z{va
zB(GficKNMotos`NU6kp%x1Za);V$Fxc$dVPySSTAXs@<$+{!K>Dz-*w=Z)p!Uu?n|
z)wrB_*VuV2Si#&hrz|0KX8dYlN9hRB)>G$Sl^R6~Hmv$tz?pg?@zRRT4QwGVtmZa#
z^g5^8x=eT8$raLiSZM*@99tHRf}LfN1&up@cRjpQ&ieQG_oj{h&#o;uF_TC&0L7xG
LtDnm{r-UW|j^yrk

literal 0
HcmV?d00001

diff --git a/graphics/pokemon/wormadam/trash/icon.png b/graphics/pokemon/wormadam/trash/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..8f6ca5dde3b929e97a723a19e0c15012385f0548
GIT binary patch
literal 310
zcmV-60m=S}P)<h;3K|Lk000e1NJLTq001BW002M)0{{R3iJ)km0000mP)t-sVw{6>
zb924Dz5oCJdz?y~%}SK^O73%<_LTO$q+0goDfafP)zxa|N-1JuT0ucUX*qpc00001
zbW%=J06^y0W&i*Hv`IukR5*?8(lH9cKokVfoFIFclxepS#3ueqZ>H!WB!x`CCS3--
zf~^pi6s9tTYnA`g1+2vB{#&M4m?ZhVxNdUq&Q^v~elyS)`NcG(K-C$5g#l7-j|yH9
z);9xy*DwewYG|b*uL@Gq^R8h}ztE5b*1`TROzwYXXZB#6WVxBcQ!+r$q2B<aI<A30
zmSe}oca#<Ya)h+`3`XxE4yN{cFb}f!2L)+Mu2dsR2<HBB-hk#|J4G_I4*&oF07*qo
IM6N<$f`*WVmjD0&

literal 0
HcmV?d00001

diff --git a/graphics/pokemon/wormadam/trash/normal.pal b/graphics/pokemon/wormadam/trash/normal.pal
new file mode 100644
index 000000000..707910aec
--- /dev/null
+++ b/graphics/pokemon/wormadam/trash/normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+16 16 16
+88 88 96
+56 56 56
+136 136 120
+88 40 80
+192 96 160
+152 64 128
+112 64 80
+176 96 104
+248 248 248
+240 144 144
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/wormadam/trash/shiny.pal b/graphics/pokemon/wormadam/trash/shiny.pal
new file mode 100644
index 000000000..84d795dcf
--- /dev/null
+++ b/graphics/pokemon/wormadam/trash/shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+16 16 16
+96 112 136
+56 64 88
+136 160 176
+80 40 64
+176 96 144
+128 72 112
+112 64 80
+176 104 120
+248 248 248
+240 152 160
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/include/constants/species.h b/include/constants/species.h
index 65d64f632..8d2be825d 100644
--- a/include/constants/species.h
+++ b/include/constants/species.h
@@ -860,9 +860,14 @@
 #define SPECIES_MEGA_SALAMENCE 854
 #define SPECIES_MEGA_BEEDRILL 855
 
-// TODO: forms
-#define SPECIES_EGG 856
+#define SPECIES_BURMY_SANDY 856
+#define SPECIES_BURMY_TRASH 857
+#define SPECIES_WORMADAM_SANDY 858
+#define SPECIES_WORMADAM_TRASH 859
 
+// TODO: forms
+
+#define SPECIES_EGG 860
 #define NUM_SPECIES SPECIES_EGG
 
 // Unown forms, not actual species
diff --git a/include/graphics.h b/include/graphics.h
index 878b09333..b4e6bb770 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -476,8 +476,12 @@ extern const u32 gMonFrontPic_Cranidos[];
 extern const u32 gMonFrontPic_Rampardos[];
 extern const u32 gMonFrontPic_Shieldon[];
 extern const u32 gMonFrontPic_Bastiodon[];
-extern const u32 gMonFrontPic_Burmy[];
-extern const u32 gMonFrontPic_Wormadam[];
+extern const u32 gMonFrontPic_BurmyPlant[];
+extern const u32 gMonFrontPic_BurmySandy[];
+extern const u32 gMonFrontPic_BurmyTrash[];
+extern const u32 gMonFrontPic_WormadamPlant[];
+extern const u32 gMonFrontPic_WormadamSandy[];
+extern const u32 gMonFrontPic_WormadamTrash[];
 extern const u32 gMonFrontPic_Mothim[];
 extern const u32 gMonFrontPic_Combee[];
 extern const u32 gMonFrontPic_Vespiquen[];
@@ -1313,8 +1317,12 @@ extern const u32 gMonBackPic_Cranidos[];
 extern const u32 gMonBackPic_Rampardos[];
 extern const u32 gMonBackPic_Shieldon[];
 extern const u32 gMonBackPic_Bastiodon[];
-extern const u32 gMonBackPic_Burmy[];
-extern const u32 gMonBackPic_Wormadam[];
+extern const u32 gMonBackPic_BurmyPlant[];
+extern const u32 gMonBackPic_BurmySandy[];
+extern const u32 gMonBackPic_BurmyTrash[];
+extern const u32 gMonBackPic_WormadamPlant[];
+extern const u32 gMonBackPic_WormadamSandy[];
+extern const u32 gMonBackPic_WormadamTrash[];
 extern const u32 gMonBackPic_Mothim[];
 extern const u32 gMonBackPic_Combee[];
 extern const u32 gMonBackPic_Vespiquen[];
@@ -2124,8 +2132,12 @@ extern const u32 gMonPalette_Cranidos[];
 extern const u32 gMonPalette_Rampardos[];
 extern const u32 gMonPalette_Shieldon[];
 extern const u32 gMonPalette_Bastiodon[];
-extern const u32 gMonPalette_Burmy[];
-extern const u32 gMonPalette_Wormadam[];
+extern const u32 gMonPalette_BurmyPlant[];
+extern const u32 gMonPalette_BurmySandy[];
+extern const u32 gMonPalette_BurmyTrash[];
+extern const u32 gMonPalette_WormadamPlant[];
+extern const u32 gMonPalette_WormadamSandy[];
+extern const u32 gMonPalette_WormadamTrash[];
 extern const u32 gMonPalette_Mothim[];
 extern const u32 gMonPalette_Combee[];
 extern const u32 gMonPalette_Vespiquen[];
@@ -2934,8 +2946,12 @@ extern const u32 gMonShinyPalette_Cranidos[];
 extern const u32 gMonShinyPalette_Rampardos[];
 extern const u32 gMonShinyPalette_Shieldon[];
 extern const u32 gMonShinyPalette_Bastiodon[];
-extern const u32 gMonShinyPalette_Burmy[];
-extern const u32 gMonShinyPalette_Wormadam[];
+extern const u32 gMonShinyPalette_BurmyPlant[];
+extern const u32 gMonShinyPalette_BurmySandy[];
+extern const u32 gMonShinyPalette_BurmyTrash[];
+extern const u32 gMonShinyPalette_WormadamPlant[];
+extern const u32 gMonShinyPalette_WormadamSandy[];
+extern const u32 gMonShinyPalette_WormadamTrash[];
 extern const u32 gMonShinyPalette_Mothim[];
 extern const u32 gMonShinyPalette_Combee[];
 extern const u32 gMonShinyPalette_Vespiquen[];
@@ -3771,8 +3787,12 @@ extern const u8 gMonIcon_Cranidos[];
 extern const u8 gMonIcon_Rampardos[];
 extern const u8 gMonIcon_Shieldon[];
 extern const u8 gMonIcon_Bastiodon[];
-extern const u8 gMonIcon_Burmy[];
-extern const u8 gMonIcon_Wormadam[];
+extern const u8 gMonIcon_BurmyPlant[];
+extern const u8 gMonIcon_BurmySandy[];
+extern const u8 gMonIcon_BurmyTrash[];
+extern const u8 gMonIcon_WormadamPlant[];
+extern const u8 gMonIcon_WormadamSandy[];
+extern const u8 gMonIcon_WormadamTrash[];
 extern const u8 gMonIcon_Mothim[];
 extern const u8 gMonIcon_Combee[];
 extern const u8 gMonIcon_Vespiquen[];
diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h
index ab8abcb38..7c612d3cc 100644
--- a/src/data/graphics/pokemon.h
+++ b/src/data/graphics/pokemon.h
@@ -439,8 +439,12 @@ const u32 gMonFrontPic_Cranidos[] = INCBIN_U32("graphics/pokemon/cranidos/anim_f
 const u32 gMonFrontPic_Rampardos[] = INCBIN_U32("graphics/pokemon/rampardos/anim_front.4bpp.lz");
 const u32 gMonFrontPic_Shieldon[] = INCBIN_U32("graphics/pokemon/shieldon/anim_front.4bpp.lz");
 const u32 gMonFrontPic_Bastiodon[] = INCBIN_U32("graphics/pokemon/bastiodon/anim_front.4bpp.lz");
-const u32 gMonFrontPic_Burmy[] = INCBIN_U32("graphics/pokemon/burmy/anim_front.4bpp.lz");
-const u32 gMonFrontPic_Wormadam[] = INCBIN_U32("graphics/pokemon/wormadam/anim_front.4bpp.lz");
+const u32 gMonFrontPic_BurmyPlant[] = INCBIN_U32("graphics/pokemon/burmy/plant/anim_front.4bpp.lz");
+const u32 gMonFrontPic_BurmySandy[] = INCBIN_U32("graphics/pokemon/burmy/sandy/anim_front.4bpp.lz");
+const u32 gMonFrontPic_BurmyTrash[] = INCBIN_U32("graphics/pokemon/burmy/trash/anim_front.4bpp.lz");
+const u32 gMonFrontPic_WormadamPlant[] = INCBIN_U32("graphics/pokemon/wormadam/plant/anim_front.4bpp.lz");
+const u32 gMonFrontPic_WormadamSandy[] = INCBIN_U32("graphics/pokemon/wormadam/sandy/anim_front.4bpp.lz");
+const u32 gMonFrontPic_WormadamTrash[] = INCBIN_U32("graphics/pokemon/wormadam/trash/anim_front.4bpp.lz");
 const u32 gMonFrontPic_Mothim[] = INCBIN_U32("graphics/pokemon/mothim/anim_front.4bpp.lz");
 const u32 gMonFrontPic_Combee[] = INCBIN_U32("graphics/pokemon/combee/anim_front.4bpp.lz");
 const u32 gMonFrontPic_Vespiquen[] = INCBIN_U32("graphics/pokemon/vespiquen/anim_front.4bpp.lz");
@@ -1276,8 +1280,12 @@ const u32 gMonBackPic_Cranidos[] = INCBIN_U32("graphics/pokemon/cranidos/back.4b
 const u32 gMonBackPic_Rampardos[] = INCBIN_U32("graphics/pokemon/rampardos/back.4bpp.lz");
 const u32 gMonBackPic_Shieldon[] = INCBIN_U32("graphics/pokemon/shieldon/back.4bpp.lz");
 const u32 gMonBackPic_Bastiodon[] = INCBIN_U32("graphics/pokemon/bastiodon/back.4bpp.lz");
-const u32 gMonBackPic_Burmy[] = INCBIN_U32("graphics/pokemon/burmy/back.4bpp.lz");
-const u32 gMonBackPic_Wormadam[] = INCBIN_U32("graphics/pokemon/wormadam/back.4bpp.lz");
+const u32 gMonBackPic_BurmyPlant[] = INCBIN_U32("graphics/pokemon/burmy/plant/back.4bpp.lz");
+const u32 gMonBackPic_BurmySandy[] = INCBIN_U32("graphics/pokemon/burmy/sandy/back.4bpp.lz");
+const u32 gMonBackPic_BurmyTrash[] = INCBIN_U32("graphics/pokemon/burmy/trash/back.4bpp.lz");
+const u32 gMonBackPic_WormadamPlant[] = INCBIN_U32("graphics/pokemon/wormadam/plant/back.4bpp.lz");
+const u32 gMonBackPic_WormadamSandy[] = INCBIN_U32("graphics/pokemon/wormadam/sandy/back.4bpp.lz");
+const u32 gMonBackPic_WormadamTrash[] = INCBIN_U32("graphics/pokemon/wormadam/trash/back.4bpp.lz");
 const u32 gMonBackPic_Mothim[] = INCBIN_U32("graphics/pokemon/mothim/back.4bpp.lz");
 const u32 gMonBackPic_Combee[] = INCBIN_U32("graphics/pokemon/combee/back.4bpp.lz");
 const u32 gMonBackPic_Vespiquen[] = INCBIN_U32("graphics/pokemon/vespiquen/back.4bpp.lz");
@@ -2087,8 +2095,12 @@ const u32 gMonPalette_Cranidos[] = INCBIN_U32("graphics/pokemon/cranidos/normal.
 const u32 gMonPalette_Rampardos[] = INCBIN_U32("graphics/pokemon/rampardos/normal.gbapal.lz");
 const u32 gMonPalette_Shieldon[] = INCBIN_U32("graphics/pokemon/shieldon/normal.gbapal.lz");
 const u32 gMonPalette_Bastiodon[] = INCBIN_U32("graphics/pokemon/bastiodon/normal.gbapal.lz");
-const u32 gMonPalette_Burmy[] = INCBIN_U32("graphics/pokemon/burmy/normal.gbapal.lz");
-const u32 gMonPalette_Wormadam[] = INCBIN_U32("graphics/pokemon/wormadam/normal.gbapal.lz");
+const u32 gMonPalette_BurmyPlant[] = INCBIN_U32("graphics/pokemon/burmy/plant/normal.gbapal.lz");
+const u32 gMonPalette_BurmySandy[] = INCBIN_U32("graphics/pokemon/burmy/sandy/normal.gbapal.lz");
+const u32 gMonPalette_BurmyTrash[] = INCBIN_U32("graphics/pokemon/burmy/trash/normal.gbapal.lz");
+const u32 gMonPalette_WormadamPlant[] = INCBIN_U32("graphics/pokemon/wormadam/plant/normal.gbapal.lz");
+const u32 gMonPalette_WormadamSandy[] = INCBIN_U32("graphics/pokemon/wormadam/sandy/normal.gbapal.lz");
+const u32 gMonPalette_WormadamTrash[] = INCBIN_U32("graphics/pokemon/wormadam/trash/normal.gbapal.lz");
 const u32 gMonPalette_Mothim[] = INCBIN_U32("graphics/pokemon/mothim/normal.gbapal.lz");
 const u32 gMonPalette_Combee[] = INCBIN_U32("graphics/pokemon/combee/normal.gbapal.lz");
 const u32 gMonPalette_Vespiquen[] = INCBIN_U32("graphics/pokemon/vespiquen/normal.gbapal.lz");
@@ -2897,8 +2909,12 @@ const u32 gMonShinyPalette_Cranidos[] = INCBIN_U32("graphics/pokemon/cranidos/sh
 const u32 gMonShinyPalette_Rampardos[] = INCBIN_U32("graphics/pokemon/rampardos/shiny.gbapal.lz");
 const u32 gMonShinyPalette_Shieldon[] = INCBIN_U32("graphics/pokemon/shieldon/shiny.gbapal.lz");
 const u32 gMonShinyPalette_Bastiodon[] = INCBIN_U32("graphics/pokemon/bastiodon/shiny.gbapal.lz");
-const u32 gMonShinyPalette_Burmy[] = INCBIN_U32("graphics/pokemon/burmy/shiny.gbapal.lz");
-const u32 gMonShinyPalette_Wormadam[] = INCBIN_U32("graphics/pokemon/wormadam/shiny.gbapal.lz");
+const u32 gMonShinyPalette_BurmyPlant[] = INCBIN_U32("graphics/pokemon/burmy/plant/shiny.gbapal.lz");
+const u32 gMonShinyPalette_BurmySandy[] = INCBIN_U32("graphics/pokemon/burmy/sandy/shiny.gbapal.lz");
+const u32 gMonShinyPalette_BurmyTrash[] = INCBIN_U32("graphics/pokemon/burmy/trash/shiny.gbapal.lz");
+const u32 gMonShinyPalette_WormadamPlant[] = INCBIN_U32("graphics/pokemon/wormadam/plant/shiny.gbapal.lz");
+const u32 gMonShinyPalette_WormadamSandy[] = INCBIN_U32("graphics/pokemon/wormadam/sandy/shiny.gbapal.lz");
+const u32 gMonShinyPalette_WormadamTrash[] = INCBIN_U32("graphics/pokemon/wormadam/trash/shiny.gbapal.lz");
 const u32 gMonShinyPalette_Mothim[] = INCBIN_U32("graphics/pokemon/mothim/shiny.gbapal.lz");
 const u32 gMonShinyPalette_Combee[] = INCBIN_U32("graphics/pokemon/combee/shiny.gbapal.lz");
 const u32 gMonShinyPalette_Vespiquen[] = INCBIN_U32("graphics/pokemon/vespiquen/shiny.gbapal.lz");
@@ -3734,8 +3750,12 @@ const u8 gMonIcon_Cranidos[] = INCBIN_U8("graphics/pokemon/cranidos/icon.4bpp");
 const u8 gMonIcon_Rampardos[] = INCBIN_U8("graphics/pokemon/rampardos/icon.4bpp");
 const u8 gMonIcon_Shieldon[] = INCBIN_U8("graphics/pokemon/shieldon/icon.4bpp");
 const u8 gMonIcon_Bastiodon[] = INCBIN_U8("graphics/pokemon/bastiodon/icon.4bpp");
-const u8 gMonIcon_Burmy[] = INCBIN_U8("graphics/pokemon/burmy/icon.4bpp");
-const u8 gMonIcon_Wormadam[] = INCBIN_U8("graphics/pokemon/wormadam/icon.4bpp");
+const u8 gMonIcon_BurmyPlant[] = INCBIN_U8("graphics/pokemon/burmy/plant/icon.4bpp");
+const u8 gMonIcon_BurmySandy[] = INCBIN_U8("graphics/pokemon/burmy/sandy/icon.4bpp");
+const u8 gMonIcon_BurmyTrash[] = INCBIN_U8("graphics/pokemon/burmy/trash/icon.4bpp");
+const u8 gMonIcon_WormadamPlant[] = INCBIN_U8("graphics/pokemon/wormadam/plant/icon.4bpp");
+const u8 gMonIcon_WormadamSandy[] = INCBIN_U8("graphics/pokemon/wormadam/sandy/icon.4bpp");
+const u8 gMonIcon_WormadamTrash[] = INCBIN_U8("graphics/pokemon/wormadam/trash/icon.4bpp");
 const u8 gMonIcon_Mothim[] = INCBIN_U8("graphics/pokemon/mothim/icon.4bpp");
 const u8 gMonIcon_Combee[] = INCBIN_U8("graphics/pokemon/combee/icon.4bpp");
 const u8 gMonIcon_Vespiquen[] = INCBIN_U8("graphics/pokemon/vespiquen/icon.4bpp");
diff --git a/src/data/pokemon/base_stats.h b/src/data/pokemon/base_stats.h
index 3a5299335..ce2591b97 100644
--- a/src/data/pokemon/base_stats.h
+++ b/src/data/pokemon/base_stats.h
@@ -10282,6 +10282,54 @@ const struct BaseStats gBaseStats[] =
 		.bodyColor = BODY_COLOR_GREEN,
 	},
 
+	[SPECIES_BURMY_SANDY] =
+	{
+		.baseHP        = 40,
+		.baseAttack    = 29,
+		.baseDefense   = 45,
+		.baseSpeed     = 36,
+		.baseSpAttack  = 29,
+		.baseSpDefense = 45,
+		.type1 = TYPE_BUG,
+		.type2 = TYPE_BUG,
+		.catchRate = 120,
+		.expYield = 45,
+		.evYield_SpAttack  = 0,
+		.evYield_SpDefense = 1,
+		.genderRatio = PERCENT_FEMALE(50),
+		.eggCycles = 15,
+		.friendship = 70,
+		.growthRate = GROWTH_MEDIUM_FAST,
+		.eggGroup1 = EGG_GROUP_BUG,
+		.eggGroup2 = EGG_GROUP_BUG,
+		.ability1 = ABILITY_SHED_SKIN,
+		.bodyColor = BODY_COLOR_GREEN,
+	},
+
+    [SPECIES_BURMY_TRASH] =
+	{
+		.baseHP        = 40,
+		.baseAttack    = 29,
+		.baseDefense   = 45,
+		.baseSpeed     = 36,
+		.baseSpAttack  = 29,
+		.baseSpDefense = 45,
+		.type1 = TYPE_BUG,
+		.type2 = TYPE_BUG,
+		.catchRate = 120,
+		.expYield = 45,
+		.evYield_SpAttack  = 0,
+		.evYield_SpDefense = 1,
+		.genderRatio = PERCENT_FEMALE(50),
+		.eggCycles = 15,
+		.friendship = 70,
+		.growthRate = GROWTH_MEDIUM_FAST,
+		.eggGroup1 = EGG_GROUP_BUG,
+		.eggGroup2 = EGG_GROUP_BUG,
+		.ability1 = ABILITY_SHED_SKIN,
+		.bodyColor = BODY_COLOR_GREEN,
+	},
+
 	[SPECIES_WORMADAM] =
 	{
 		.baseHP        = 60,
@@ -10307,6 +10355,55 @@ const struct BaseStats gBaseStats[] =
 		.bodyColor = BODY_COLOR_GREEN,
 	},
 
+	[SPECIES_WORMADAM_SANDY] =
+	{
+		.baseHP        = 60,
+		.baseAttack    = 79,
+		.baseDefense   = 105,
+		.baseSpeed     = 36,
+		.baseSpAttack  = 59,
+		.baseSpDefense = 85,
+		.type1 = TYPE_BUG,
+		.type2 = TYPE_GROUND,
+		.catchRate = 45,
+		.expYield = 148,
+		.evYield_Defense   = 2,
+		.item2 = ITEM_SILVER_POWDER,
+		.genderRatio = MON_FEMALE,
+		.eggCycles = 15,
+		.friendship = 70,
+		.growthRate = GROWTH_MEDIUM_FAST,
+		.eggGroup1 = EGG_GROUP_BUG,
+		.eggGroup2 = EGG_GROUP_BUG,
+		.ability1 = ABILITY_ANTICIPATION,
+		.bodyColor = BODY_COLOR_BROWN,
+	},
+
+	[SPECIES_WORMADAM_TRASH] =
+	{
+		.baseHP        = 60,
+		.baseAttack    = 69,
+		.baseDefense   = 95,
+		.baseSpeed     = 36,
+		.baseSpAttack  = 69,
+		.baseSpDefense = 95,
+		.type1 = TYPE_BUG,
+		.type2 = TYPE_STEEL,
+		.catchRate = 45,
+		.expYield = 148,
+		.evYield_Defense   = 1,
+		.evYield_SpDefense = 1,
+		.item2 = ITEM_SILVER_POWDER,
+		.genderRatio = MON_FEMALE,
+		.eggCycles = 15,
+		.friendship = 70,
+		.growthRate = GROWTH_MEDIUM_FAST,
+		.eggGroup1 = EGG_GROUP_BUG,
+		.eggGroup2 = EGG_GROUP_BUG,
+		.ability1 = ABILITY_ANTICIPATION,
+		.bodyColor = BODY_COLOR_RED,
+	},
+
 	[SPECIES_MOTHIM] =
 	{
 		.baseHP        = 70,
diff --git a/src/data/pokemon/evolution.h b/src/data/pokemon/evolution.h
index 00b672450..5a2d55401 100644
--- a/src/data/pokemon/evolution.h
+++ b/src/data/pokemon/evolution.h
@@ -268,6 +268,10 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] =
 	[SPECIES_SHIELDON]	 = {{EVO_LEVEL, 30, SPECIES_BASTIODON}},
 	[SPECIES_BURMY]	     = {{EVO_LEVEL_FEMALE, 20, SPECIES_WORMADAM},
                             {EVO_LEVEL_MALE, 20, SPECIES_MOTHIM}},
+    [SPECIES_BURMY_SANDY]= {{EVO_LEVEL_FEMALE, 20, SPECIES_WORMADAM_SANDY},
+                            {EVO_LEVEL_MALE, 20, SPECIES_MOTHIM}},
+    [SPECIES_BURMY_TRASH]= {{EVO_LEVEL_FEMALE, 20, SPECIES_WORMADAM_TRASH},
+                            {EVO_LEVEL_MALE, 20, SPECIES_MOTHIM}},
 	[SPECIES_COMBEE]	 = {{EVO_LEVEL_FEMALE, 21, SPECIES_VESPIQUEN}},
 	[SPECIES_BUIZEL]	 = {{EVO_LEVEL, 26, SPECIES_FLOATZEL}},
 	[SPECIES_CHERUBI]	 = {{EVO_LEVEL, 25, SPECIES_CHERRIM}},
diff --git a/src/data/pokemon_graphics/back_pic_table.h b/src/data/pokemon_graphics/back_pic_table.h
index 8757ab7a3..e3bc8d566 100644
--- a/src/data/pokemon_graphics/back_pic_table.h
+++ b/src/data/pokemon_graphics/back_pic_table.h
@@ -412,8 +412,12 @@ const struct CompressedSpriteSheet gMonBackPicTable[] =
     SPECIES_SPRITE(RAMPARDOS, gMonBackPic_Rampardos),
     SPECIES_SPRITE(SHIELDON, gMonBackPic_Shieldon),
     SPECIES_SPRITE(BASTIODON, gMonBackPic_Bastiodon),
-    SPECIES_SPRITE(BURMY, gMonBackPic_Burmy),
-    SPECIES_SPRITE(WORMADAM, gMonBackPic_Wormadam),
+    SPECIES_SPRITE(BURMY, gMonBackPic_BurmyPlant),
+    SPECIES_SPRITE(BURMY_SANDY, gMonBackPic_BurmySandy),
+    SPECIES_SPRITE(BURMY_TRASH, gMonBackPic_BurmyTrash),
+    SPECIES_SPRITE(WORMADAM, gMonBackPic_WormadamPlant),
+    SPECIES_SPRITE(WORMADAM_SANDY, gMonBackPic_WormadamSandy),
+    SPECIES_SPRITE(WORMADAM_TRASH, gMonBackPic_WormadamTrash),
     SPECIES_SPRITE(MOTHIM, gMonBackPic_Mothim),
     SPECIES_SPRITE(COMBEE, gMonBackPic_Combee),
     SPECIES_SPRITE(VESPIQUEN, gMonBackPic_Vespiquen),
diff --git a/src/data/pokemon_graphics/front_pic_anims.h b/src/data/pokemon_graphics/front_pic_anims.h
index 8c60326ae..1c37073b7 100644
--- a/src/data/pokemon_graphics/front_pic_anims.h
+++ b/src/data/pokemon_graphics/front_pic_anims.h
@@ -12426,7 +12426,11 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[] =
     ANIM_CMD(SHIELDON),
     ANIM_CMD(BASTIODON),
     ANIM_CMD(BURMY),
+    ANIM_CMD_FULL(BURMY_SANDY, sAnims_BURMY),
+    ANIM_CMD_FULL(BURMY_TRASH, sAnims_BURMY),
     ANIM_CMD(WORMADAM),
+    ANIM_CMD_FULL(WORMADAM_SANDY, sAnims_WORMADAM),
+    ANIM_CMD_FULL(WORMADAM_TRASH, sAnims_WORMADAM),
     ANIM_CMD(MOTHIM),
     ANIM_CMD(COMBEE),
     ANIM_CMD(VESPIQUEN),
diff --git a/src/data/pokemon_graphics/front_pic_table.h b/src/data/pokemon_graphics/front_pic_table.h
index 60bcd2255..67f874b00 100644
--- a/src/data/pokemon_graphics/front_pic_table.h
+++ b/src/data/pokemon_graphics/front_pic_table.h
@@ -412,8 +412,12 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] =
     SPECIES_SPRITE(RAMPARDOS, gMonFrontPic_Rampardos),
     SPECIES_SPRITE(SHIELDON, gMonFrontPic_Shieldon),
     SPECIES_SPRITE(BASTIODON, gMonFrontPic_Bastiodon),
-    SPECIES_SPRITE(BURMY, gMonFrontPic_Burmy),
-    SPECIES_SPRITE(WORMADAM, gMonFrontPic_Wormadam),
+    SPECIES_SPRITE(BURMY, gMonFrontPic_BurmyPlant),
+    SPECIES_SPRITE(BURMY_SANDY, gMonFrontPic_BurmySandy),
+    SPECIES_SPRITE(BURMY_TRASH, gMonFrontPic_BurmyTrash),
+    SPECIES_SPRITE(WORMADAM, gMonFrontPic_WormadamPlant),
+    SPECIES_SPRITE(WORMADAM_SANDY, gMonFrontPic_WormadamSandy),
+    SPECIES_SPRITE(WORMADAM_TRASH, gMonFrontPic_WormadamTrash),
     SPECIES_SPRITE(MOTHIM, gMonFrontPic_Mothim),
     SPECIES_SPRITE(COMBEE, gMonFrontPic_Combee),
     SPECIES_SPRITE(VESPIQUEN, gMonFrontPic_Vespiquen),
diff --git a/src/data/pokemon_graphics/palette_table.h b/src/data/pokemon_graphics/palette_table.h
index b3875eefc..36525426e 100644
--- a/src/data/pokemon_graphics/palette_table.h
+++ b/src/data/pokemon_graphics/palette_table.h
@@ -412,8 +412,12 @@ const struct CompressedSpritePalette gMonPaletteTable[] =
     SPECIES_PAL(RAMPARDOS, gMonPalette_Rampardos),
     SPECIES_PAL(SHIELDON, gMonPalette_Shieldon),
     SPECIES_PAL(BASTIODON, gMonPalette_Bastiodon),
-    SPECIES_PAL(BURMY, gMonPalette_Burmy),
-    SPECIES_PAL(WORMADAM, gMonPalette_Wormadam),
+    SPECIES_PAL(BURMY, gMonPalette_BurmyPlant),
+    SPECIES_PAL(BURMY_SANDY, gMonPalette_BurmySandy),
+    SPECIES_PAL(BURMY_TRASH, gMonPalette_BurmyTrash),
+    SPECIES_PAL(WORMADAM, gMonPalette_WormadamPlant),
+    SPECIES_PAL(WORMADAM_SANDY, gMonPalette_WormadamSandy),
+    SPECIES_PAL(WORMADAM_TRASH, gMonPalette_WormadamTrash),
     SPECIES_PAL(MOTHIM, gMonPalette_Mothim),
     SPECIES_PAL(COMBEE, gMonPalette_Combee),
     SPECIES_PAL(VESPIQUEN, gMonPalette_Vespiquen),
diff --git a/src/data/pokemon_graphics/shiny_palette_table.h b/src/data/pokemon_graphics/shiny_palette_table.h
index e48812d57..837f7607c 100644
--- a/src/data/pokemon_graphics/shiny_palette_table.h
+++ b/src/data/pokemon_graphics/shiny_palette_table.h
@@ -412,8 +412,12 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] =
     SPECIES_SHINY_PAL(RAMPARDOS, gMonShinyPalette_Rampardos),
     SPECIES_SHINY_PAL(SHIELDON, gMonShinyPalette_Shieldon),
     SPECIES_SHINY_PAL(BASTIODON, gMonShinyPalette_Bastiodon),
-    SPECIES_SHINY_PAL(BURMY, gMonShinyPalette_Burmy),
-    SPECIES_SHINY_PAL(WORMADAM, gMonShinyPalette_Wormadam),
+    SPECIES_SHINY_PAL(BURMY, gMonShinyPalette_BurmyPlant),
+    SPECIES_SHINY_PAL(BURMY_SANDY, gMonShinyPalette_BurmySandy),
+    SPECIES_SHINY_PAL(BURMY_TRASH, gMonShinyPalette_BurmyTrash),
+    SPECIES_SHINY_PAL(WORMADAM, gMonShinyPalette_WormadamPlant),
+    SPECIES_SHINY_PAL(WORMADAM_SANDY, gMonShinyPalette_WormadamSandy),
+    SPECIES_SHINY_PAL(WORMADAM_TRASH, gMonShinyPalette_WormadamTrash),
     SPECIES_SHINY_PAL(MOTHIM, gMonShinyPalette_Mothim),
     SPECIES_SHINY_PAL(COMBEE, gMonShinyPalette_Combee),
     SPECIES_SHINY_PAL(VESPIQUEN, gMonShinyPalette_Vespiquen),
diff --git a/src/pokemon.c b/src/pokemon.c
index fa897ea55..88f991332 100644
--- a/src/pokemon.c
+++ b/src/pokemon.c
@@ -709,7 +709,11 @@ const u16 gSpeciesToNationalPokedexNum[NUM_SPECIES] = // Assigns all species to
 	SPECIES_TO_NATIONAL(SHIELDON),
 	SPECIES_TO_NATIONAL(BASTIODON),
 	SPECIES_TO_NATIONAL(BURMY),
+	[SPECIES_BURMY_SANDY] = NATIONAL_DEX_BURMY,
+	[SPECIES_BURMY_TRASH] = NATIONAL_DEX_BURMY,
 	SPECIES_TO_NATIONAL(WORMADAM),
+	[SPECIES_WORMADAM_SANDY] = NATIONAL_DEX_WORMADAM,
+	[SPECIES_WORMADAM_TRASH] = NATIONAL_DEX_WORMADAM,
 	SPECIES_TO_NATIONAL(MOTHIM),
 	SPECIES_TO_NATIONAL(COMBEE),
 	SPECIES_TO_NATIONAL(VESPIQUEN),
diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c
index 25f5a5cab..99f9b3622 100644
--- a/src/pokemon_icon.c
+++ b/src/pokemon_icon.c
@@ -437,8 +437,12 @@ const u8 *const gMonIconTable[] =
     [SPECIES_RAMPARDOS] = gMonIcon_Rampardos,
     [SPECIES_SHIELDON] = gMonIcon_Shieldon,
     [SPECIES_BASTIODON] = gMonIcon_Bastiodon,
-    [SPECIES_BURMY] = gMonIcon_Burmy,
-    [SPECIES_WORMADAM] = gMonIcon_Wormadam,
+    [SPECIES_BURMY] = gMonIcon_BurmyPlant,
+    [SPECIES_BURMY_SANDY] = gMonIcon_BurmySandy,
+    [SPECIES_BURMY_TRASH] = gMonIcon_BurmyTrash,
+    [SPECIES_WORMADAM] = gMonIcon_WormadamPlant,
+    [SPECIES_WORMADAM_SANDY] = gMonIcon_WormadamSandy,
+    [SPECIES_WORMADAM_TRASH] = gMonIcon_WormadamTrash,
     [SPECIES_MOTHIM] = gMonIcon_Mothim,
     [SPECIES_COMBEE] = gMonIcon_Combee,
     [SPECIES_VESPIQUEN] = gMonIcon_Vespiquen,