Rotom forms and meowstic female

graphics/pokemon/meowstic/female/normal.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+96 112 112
+0 0 0
+248 248 248
+192 200 200
+8 40 56
+32 112 160
+0 72 120
+248 208 0
+192 24 56
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0

graphics/pokemon/meowstic/female/shiny.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+112 112 112
+0 0 0
+248 248 248
+192 192 192
+56 56 24
+240 240 96
+176 176 64
+248 208 0
+192 24 56
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0

graphics/pokemon/rotom/fan/normal.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+200 152 80
+240 208 112
+248 232 168
+248 248 248
+176 88 48
+120 56 32
+248 112 64
+248 160 128
+16 16 16
+88 80 96
+184 184 184
+248 192 136
+208 136 56
+48 40 40
+0 0 0

graphics/pokemon/rotom/fan/shiny.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+232 160 112
+240 200 160
+240 224 200
+248 248 248
+184 24 80
+120 0 40
+224 56 112
+248 128 168
+16 16 16
+72 72 80
+184 184 184
+248 216 112
+224 112 24
+40 40 40
+0 0 0

graphics/pokemon/rotom/frost/normal.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+144 104 168
+168 136 192
+176 88 48
+120 56 32
+248 160 128
+248 112 64
+16 16 16
+248 248 248
+176 152 192
+120 88 152
+184 184 184
+80 72 72
+0 0 0
+0 0 0
+0 0 0

graphics/pokemon/rotom/frost/shiny.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+232 160 112
+240 200 160
+184 24 80
+120 0 40
+248 128 168
+224 56 112
+16 16 16
+248 248 248
+144 128 216
+104 56 168
+184 184 184
+72 72 80
+0 0 0
+0 0 0
+0 0 0

graphics/pokemon/rotom/heat/normal.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+168 32 64
+224 72 72
+240 136 136
+248 248 248
+176 88 48
+120 56 32
+248 112 64
+248 160 128
+184 184 184
+232 128 128
+200 64 56
+16 16 16
+56 56 56
+120 120 128
+0 0 0

graphics/pokemon/rotom/heat/shiny.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+232 160 112
+240 200 160
+240 224 200
+248 248 248
+184 24 80
+120 0 40
+224 56 112
+248 128 168
+184 184 184
+248 112 112
+200 48 56
+16 16 16
+48 48 48
+88 88 96
+0 0 0

graphics/pokemon/rotom/mow/normal.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+64 152 56
+144 184 72
+176 88 48
+120 56 32
+248 112 64
+248 160 128
+16 16 16
+80 72 80
+248 248 248
+160 192 104
+192 184 176
+120 160 56
+184 216 144
+40 40 40
+0 0 0

graphics/pokemon/rotom/mow/shiny.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+232 160 112
+240 200 160
+184 24 80
+120 0 40
+224 56 112
+248 128 168
+16 16 16
+72 72 80
+248 248 248
+32 176 80
+184 184 184
+8 120 64
+240 224 200
+40 40 40
+0 0 0

graphics/pokemon/rotom/wash/normal.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+32 144 168
+48 168 192
+176 88 48
+248 112 64
+120 56 32
+248 160 128
+248 248 248
+184 184 184
+104 192 216
+16 16 16
+136 208 224
+80 80 72
+48 48 48
+32 144 168
+0 0 0

graphics/pokemon/rotom/wash/shiny.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+232 160 112
+240 200 160
+184 24 80
+224 56 112
+120 0 40
+248 128 168
+248 248 248
+184 184 184
+64 136 232
+16 16 16
+240 224 200
+72 72 80
+40 40 40
+24 72 168
+0 0 0

include/graphics.h

@@ -547,7 +547,12 @@ extern const u32 gMonFrontPic_Gallade[];
 extern const u32 gMonFrontPic_Probopass[];
 extern const u32 gMonFrontPic_Dusknoir[];
 extern const u32 gMonFrontPic_Froslass[];
-extern const u32 gMonFrontPic_Rotom[];
+extern const u32 gMonFrontPic_RotomNormal[];
+extern const u32 gMonFrontPic_RotomHeat[];
+extern const u32 gMonFrontPic_RotomFrost[];
+extern const u32 gMonFrontPic_RotomFan[];
+extern const u32 gMonFrontPic_RotomMow[];
+extern const u32 gMonFrontPic_RotomWash[];
 extern const u32 gMonFrontPic_Uxie[];
 extern const u32 gMonFrontPic_Mesprit[];
 extern const u32 gMonFrontPic_Azelf[];
@@ -746,7 +751,8 @@ extern const u32 gMonFrontPic_Pancham[];
 extern const u32 gMonFrontPic_Pangoro[];
 extern const u32 gMonFrontPic_Furfrou[];
 extern const u32 gMonFrontPic_Espurr[];
-extern const u32 gMonFrontPic_Meowstic[];
+extern const u32 gMonFrontPic_MeowsticMale[];
+extern const u32 gMonFrontPic_MeowsticFemale[];
 extern const u32 gMonFrontPic_Honedge[];
 extern const u32 gMonFrontPic_Doublade[];
 extern const u32 gMonFrontPic_Aegislash[];
@@ -1388,7 +1394,12 @@ extern const u32 gMonBackPic_Gallade[];
 extern const u32 gMonBackPic_Probopass[];
 extern const u32 gMonBackPic_Dusknoir[];
 extern const u32 gMonBackPic_Froslass[];
-extern const u32 gMonBackPic_Rotom[];
+extern const u32 gMonBackPic_RotomNormal[];
+extern const u32 gMonBackPic_RotomHeat[];
+extern const u32 gMonBackPic_RotomFrost[];
+extern const u32 gMonBackPic_RotomFan[];
+extern const u32 gMonBackPic_RotomMow[];
+extern const u32 gMonBackPic_RotomWash[];
 extern const u32 gMonBackPic_Uxie[];
 extern const u32 gMonBackPic_Mesprit[];
 extern const u32 gMonBackPic_Azelf[];
@@ -1587,7 +1598,8 @@ extern const u32 gMonBackPic_Pancham[];
 extern const u32 gMonBackPic_Pangoro[];
 extern const u32 gMonBackPic_Furfrou[];
 extern const u32 gMonBackPic_Espurr[];
-extern const u32 gMonBackPic_Meowstic[];
+extern const u32 gMonBackPic_MeowsticMale[];
+extern const u32 gMonBackPic_MeowsticFemale[];
 extern const u32 gMonBackPic_Honedge[];
 extern const u32 gMonBackPic_Doublade[];
 extern const u32 gMonBackPic_Aegislash[];
@@ -2203,7 +2215,12 @@ extern const u32 gMonPalette_Gallade[];
 extern const u32 gMonPalette_Probopass[];
 extern const u32 gMonPalette_Dusknoir[];
 extern const u32 gMonPalette_Froslass[];
-extern const u32 gMonPalette_Rotom[];
+extern const u32 gMonPalette_RotomNormal[];
+extern const u32 gMonPalette_RotomHeat[];
+extern const u32 gMonPalette_RotomFrost[];
+extern const u32 gMonPalette_RotomFan[];
+extern const u32 gMonPalette_RotomMow[];
+extern const u32 gMonPalette_RotomWash[];
 extern const u32 gMonPalette_Uxie[];
 extern const u32 gMonPalette_Mesprit[];
 extern const u32 gMonPalette_Azelf[];
@@ -2402,7 +2419,8 @@ extern const u32 gMonPalette_Pancham[];
 extern const u32 gMonPalette_Pangoro[];
 extern const u32 gMonPalette_Furfrou[];
 extern const u32 gMonPalette_Espurr[];
-extern const u32 gMonPalette_Meowstic[];
+extern const u32 gMonPalette_MeowsticMale[];
+extern const u32 gMonPalette_MeowsticFemale[];
 extern const u32 gMonPalette_Honedge[];
 extern const u32 gMonPalette_Doublade[];
 extern const u32 gMonPalette_Aegislash[];
@@ -3017,7 +3035,12 @@ extern const u32 gMonShinyPalette_Gallade[];
 extern const u32 gMonShinyPalette_Probopass[];
 extern const u32 gMonShinyPalette_Dusknoir[];
 extern const u32 gMonShinyPalette_Froslass[];
-extern const u32 gMonShinyPalette_Rotom[];
+extern const u32 gMonShinyPalette_RotomNormal[];
+extern const u32 gMonShinyPalette_RotomHeat[];
+extern const u32 gMonShinyPalette_RotomFrost[];
+extern const u32 gMonShinyPalette_RotomFan[];
+extern const u32 gMonShinyPalette_RotomMow[];
+extern const u32 gMonShinyPalette_RotomWash[];
 extern const u32 gMonShinyPalette_Uxie[];
 extern const u32 gMonShinyPalette_Mesprit[];
 extern const u32 gMonShinyPalette_Azelf[];
@@ -3216,7 +3239,8 @@ extern const u32 gMonShinyPalette_Pancham[];
 extern const u32 gMonShinyPalette_Pangoro[];
 extern const u32 gMonShinyPalette_Furfrou[];
 extern const u32 gMonShinyPalette_Espurr[];
-extern const u32 gMonShinyPalette_Meowstic[];
+extern const u32 gMonShinyPalette_MeowsticMale[];
+extern const u32 gMonShinyPalette_MeowsticFemale[];
 extern const u32 gMonShinyPalette_Honedge[];
 extern const u32 gMonShinyPalette_Doublade[];
 extern const u32 gMonShinyPalette_Aegislash[];
@@ -3858,7 +3882,12 @@ extern const u8 gMonIcon_Gallade[];
 extern const u8 gMonIcon_Probopass[];
 extern const u8 gMonIcon_Dusknoir[];
 extern const u8 gMonIcon_Froslass[];
-extern const u8 gMonIcon_Rotom[];
+extern const u8 gMonIcon_RotomNormal[];
+extern const u8 gMonIcon_RotomHeat[];
+extern const u8 gMonIcon_RotomFrost[];
+extern const u8 gMonIcon_RotomFan[];
+extern const u8 gMonIcon_RotomMow[];
+extern const u8 gMonIcon_RotomWash[];
 extern const u8 gMonIcon_Uxie[];
 extern const u8 gMonIcon_Mesprit[];
 extern const u8 gMonIcon_Azelf[];
@@ -4057,7 +4086,8 @@ extern const u8 gMonIcon_Pancham[];
 extern const u8 gMonIcon_Pangoro[];
 extern const u8 gMonIcon_Furfrou[];
 extern const u8 gMonIcon_Espurr[];
-extern const u8 gMonIcon_Meowstic[];
+extern const u8 gMonIcon_MeowsticMale[];
+extern const u8 gMonIcon_MeowsticFemale[];
 extern const u8 gMonIcon_Honedge[];
 extern const u8 gMonIcon_Doublade[];
 extern const u8 gMonIcon_Aegislash[];

src/data/graphics/pokemon.h

@@ -510,7 +510,12 @@ const u32 gMonFrontPic_Gallade[] = INCBIN_U32("graphics/pokemon/gallade/anim_fro
 const u32 gMonFrontPic_Probopass[] = INCBIN_U32("graphics/pokemon/probopass/anim_front.4bpp.lz");
 const u32 gMonFrontPic_Dusknoir[] = INCBIN_U32("graphics/pokemon/dusknoir/anim_front.4bpp.lz");
 const u32 gMonFrontPic_Froslass[] = INCBIN_U32("graphics/pokemon/froslass/anim_front.4bpp.lz");
-const u32 gMonFrontPic_Rotom[] = INCBIN_U32("graphics/pokemon/rotom/anim_front.4bpp.lz");
+const u32 gMonFrontPic_RotomNormal[] = INCBIN_U32("graphics/pokemon/rotom/normal/anim_front.4bpp.lz");
+const u32 gMonFrontPic_RotomHeat[] = INCBIN_U32("graphics/pokemon/rotom/heat/anim_front.4bpp.lz");
+const u32 gMonFrontPic_RotomFrost[] = INCBIN_U32("graphics/pokemon/rotom/frost/anim_front.4bpp.lz");
+const u32 gMonFrontPic_RotomFan[] = INCBIN_U32("graphics/pokemon/rotom/fan/anim_front.4bpp.lz");
+const u32 gMonFrontPic_RotomMow[] = INCBIN_U32("graphics/pokemon/rotom/mow/anim_front.4bpp.lz");
+const u32 gMonFrontPic_RotomWash[] = INCBIN_U32("graphics/pokemon/rotom/wash/anim_front.4bpp.lz");
 const u32 gMonFrontPic_Uxie[] = INCBIN_U32("graphics/pokemon/uxie/anim_front.4bpp.lz");
 const u32 gMonFrontPic_Mesprit[] = INCBIN_U32("graphics/pokemon/mesprit/anim_front.4bpp.lz");
 const u32 gMonFrontPic_Azelf[] = INCBIN_U32("graphics/pokemon/azelf/anim_front.4bpp.lz");
@@ -709,7 +714,8 @@ const u32 gMonFrontPic_Pancham[] = INCBIN_U32("graphics/pokemon/pancham/front.4b
 const u32 gMonFrontPic_Pangoro[] = INCBIN_U32("graphics/pokemon/pangoro/front.4bpp.lz");
 const u32 gMonFrontPic_Furfrou[] = INCBIN_U32("graphics/pokemon/furfrou/front.4bpp.lz");
 const u32 gMonFrontPic_Espurr[] = INCBIN_U32("graphics/pokemon/espurr/front.4bpp.lz");
-const u32 gMonFrontPic_Meowstic[] = INCBIN_U32("graphics/pokemon/meowstic/front.4bpp.lz");
+const u32 gMonFrontPic_MeowsticMale[] = INCBIN_U32("graphics/pokemon/meowstic/male/front.4bpp.lz");
+const u32 gMonFrontPic_MeowsticFemale[] = INCBIN_U32("graphics/pokemon/meowstic/female/front.4bpp.lz");
 const u32 gMonFrontPic_Honedge[] = INCBIN_U32("graphics/pokemon/honedge/front.4bpp.lz");
 const u32 gMonFrontPic_Doublade[] = INCBIN_U32("graphics/pokemon/doublade/front.4bpp.lz");
 const u32 gMonFrontPic_Aegislash[] = INCBIN_U32("graphics/pokemon/aegislash/front.4bpp.lz");
@@ -1351,7 +1357,12 @@ const u32 gMonBackPic_Gallade[] = INCBIN_U32("graphics/pokemon/gallade/back.4bpp
 const u32 gMonBackPic_Probopass[] = INCBIN_U32("graphics/pokemon/probopass/back.4bpp.lz");
 const u32 gMonBackPic_Dusknoir[] = INCBIN_U32("graphics/pokemon/dusknoir/back.4bpp.lz");
 const u32 gMonBackPic_Froslass[] = INCBIN_U32("graphics/pokemon/froslass/back.4bpp.lz");
-const u32 gMonBackPic_Rotom[] = INCBIN_U32("graphics/pokemon/rotom/back.4bpp.lz");
+const u32 gMonBackPic_RotomNormal[] = INCBIN_U32("graphics/pokemon/rotom/normal/back.4bpp.lz");
+const u32 gMonBackPic_RotomHeat[] = INCBIN_U32("graphics/pokemon/rotom/heat/back.4bpp.lz");
+const u32 gMonBackPic_RotomFrost[] = INCBIN_U32("graphics/pokemon/rotom/frost/back.4bpp.lz");
+const u32 gMonBackPic_RotomFan[] = INCBIN_U32("graphics/pokemon/rotom/fan/back.4bpp.lz");
+const u32 gMonBackPic_RotomMow[] = INCBIN_U32("graphics/pokemon/rotom/mow/back.4bpp.lz");
+const u32 gMonBackPic_RotomWash[] = INCBIN_U32("graphics/pokemon/rotom/wash/back.4bpp.lz");
 const u32 gMonBackPic_Uxie[] = INCBIN_U32("graphics/pokemon/uxie/back.4bpp.lz");
 const u32 gMonBackPic_Mesprit[] = INCBIN_U32("graphics/pokemon/mesprit/back.4bpp.lz");
 const u32 gMonBackPic_Azelf[] = INCBIN_U32("graphics/pokemon/azelf/back.4bpp.lz");
@@ -1550,7 +1561,8 @@ const u32 gMonBackPic_Pancham[] = INCBIN_U32("graphics/pokemon/pancham/back.4bpp
 const u32 gMonBackPic_Pangoro[] = INCBIN_U32("graphics/pokemon/pangoro/back.4bpp.lz");
 const u32 gMonBackPic_Furfrou[] = INCBIN_U32("graphics/pokemon/furfrou/back.4bpp.lz");
 const u32 gMonBackPic_Espurr[] = INCBIN_U32("graphics/pokemon/espurr/back.4bpp.lz");
-const u32 gMonBackPic_Meowstic[] = INCBIN_U32("graphics/pokemon/meowstic/back.4bpp.lz");
+const u32 gMonBackPic_MeowsticMale[] = INCBIN_U32("graphics/pokemon/meowstic/male/back.4bpp.lz");
+const u32 gMonBackPic_MeowsticFemale[] = INCBIN_U32("graphics/pokemon/meowstic/female/back.4bpp.lz");
 const u32 gMonBackPic_Honedge[] = INCBIN_U32("graphics/pokemon/honedge/back.4bpp.lz");
 const u32 gMonBackPic_Doublade[] = INCBIN_U32("graphics/pokemon/doublade/back.4bpp.lz");
 const u32 gMonBackPic_Aegislash[] = INCBIN_U32("graphics/pokemon/aegislash/back.4bpp.lz");
@@ -2166,7 +2178,12 @@ const u32 gMonPalette_Gallade[] = INCBIN_U32("graphics/pokemon/gallade/normal.gb
 const u32 gMonPalette_Probopass[] = INCBIN_U32("graphics/pokemon/probopass/normal.gbapal.lz");
 const u32 gMonPalette_Dusknoir[] = INCBIN_U32("graphics/pokemon/dusknoir/normal.gbapal.lz");
 const u32 gMonPalette_Froslass[] = INCBIN_U32("graphics/pokemon/froslass/normal.gbapal.lz");
-const u32 gMonPalette_Rotom[] = INCBIN_U32("graphics/pokemon/rotom/normal.gbapal.lz");
+const u32 gMonPalette_RotomNormal[] = INCBIN_U32("graphics/pokemon/rotom/normal/normal.gbapal.lz");
+const u32 gMonPalette_RotomHeat[] = INCBIN_U32("graphics/pokemon/rotom/heat/normal.gbapal.lz");
+const u32 gMonPalette_RotomFrost[] = INCBIN_U32("graphics/pokemon/rotom/frost/normal.gbapal.lz");
+const u32 gMonPalette_RotomFan[] = INCBIN_U32("graphics/pokemon/rotom/fan/normal.gbapal.lz");
+const u32 gMonPalette_RotomMow[] = INCBIN_U32("graphics/pokemon/rotom/mow/normal.gbapal.lz");
+const u32 gMonPalette_RotomWash[] = INCBIN_U32("graphics/pokemon/rotom/wash/normal.gbapal.lz");
 const u32 gMonPalette_Uxie[] = INCBIN_U32("graphics/pokemon/uxie/normal.gbapal.lz");
 const u32 gMonPalette_Mesprit[] = INCBIN_U32("graphics/pokemon/mesprit/normal.gbapal.lz");
 const u32 gMonPalette_Azelf[] = INCBIN_U32("graphics/pokemon/azelf/normal.gbapal.lz");
@@ -2365,7 +2382,8 @@ const u32 gMonPalette_Pancham[] = INCBIN_U32("graphics/pokemon/pancham/normal.gb
 const u32 gMonPalette_Pangoro[] = INCBIN_U32("graphics/pokemon/pangoro/normal.gbapal.lz");
 const u32 gMonPalette_Furfrou[] = INCBIN_U32("graphics/pokemon/furfrou/normal.gbapal.lz");
 const u32 gMonPalette_Espurr[] = INCBIN_U32("graphics/pokemon/espurr/normal.gbapal.lz");
-const u32 gMonPalette_Meowstic[] = INCBIN_U32("graphics/pokemon/meowstic/normal.gbapal.lz");
+const u32 gMonPalette_MeowsticMale[] = INCBIN_U32("graphics/pokemon/meowstic/male/normal.gbapal.lz");
+const u32 gMonPalette_MeowsticFemale[] = INCBIN_U32("graphics/pokemon/meowstic/female/normal.gbapal.lz");
 const u32 gMonPalette_Honedge[] = INCBIN_U32("graphics/pokemon/honedge/normal.gbapal.lz");
 const u32 gMonPalette_Doublade[] = INCBIN_U32("graphics/pokemon/doublade/normal.gbapal.lz");
 const u32 gMonPalette_Aegislash[] = INCBIN_U32("graphics/pokemon/aegislash/normal.gbapal.lz");
@@ -2980,7 +2998,12 @@ const u32 gMonShinyPalette_Gallade[] = INCBIN_U32("graphics/pokemon/gallade/shin
 const u32 gMonShinyPalette_Probopass[] = INCBIN_U32("graphics/pokemon/probopass/shiny.gbapal.lz");
 const u32 gMonShinyPalette_Dusknoir[] = INCBIN_U32("graphics/pokemon/dusknoir/shiny.gbapal.lz");
 const u32 gMonShinyPalette_Froslass[] = INCBIN_U32("graphics/pokemon/froslass/shiny.gbapal.lz");
-const u32 gMonShinyPalette_Rotom[] = INCBIN_U32("graphics/pokemon/rotom/shiny.gbapal.lz");
+const u32 gMonShinyPalette_RotomNormal[] = INCBIN_U32("graphics/pokemon/rotom/normal/shiny.gbapal.lz");
+const u32 gMonShinyPalette_RotomHeat[] = INCBIN_U32("graphics/pokemon/rotom/heat/shiny.gbapal.lz");
+const u32 gMonShinyPalette_RotomFrost[] = INCBIN_U32("graphics/pokemon/rotom/frost/shiny.gbapal.lz");
+const u32 gMonShinyPalette_RotomFan[] = INCBIN_U32("graphics/pokemon/rotom/fan/shiny.gbapal.lz");
+const u32 gMonShinyPalette_RotomMow[] = INCBIN_U32("graphics/pokemon/rotom/mow/shiny.gbapal.lz");
+const u32 gMonShinyPalette_RotomWash[] = INCBIN_U32("graphics/pokemon/rotom/wash/shiny.gbapal.lz");
 const u32 gMonShinyPalette_Uxie[] = INCBIN_U32("graphics/pokemon/uxie/shiny.gbapal.lz");
 const u32 gMonShinyPalette_Mesprit[] = INCBIN_U32("graphics/pokemon/mesprit/shiny.gbapal.lz");
 const u32 gMonShinyPalette_Azelf[] = INCBIN_U32("graphics/pokemon/azelf/shiny.gbapal.lz");
@@ -3179,7 +3202,8 @@ const u32 gMonShinyPalette_Pancham[] = INCBIN_U32("graphics/pokemon/pancham/shin
 const u32 gMonShinyPalette_Pangoro[] = INCBIN_U32("graphics/pokemon/pangoro/shiny.gbapal.lz");
 const u32 gMonShinyPalette_Furfrou[] = INCBIN_U32("graphics/pokemon/furfrou/shiny.gbapal.lz");
 const u32 gMonShinyPalette_Espurr[] = INCBIN_U32("graphics/pokemon/espurr/shiny.gbapal.lz");
-const u32 gMonShinyPalette_Meowstic[] = INCBIN_U32("graphics/pokemon/meowstic/shiny.gbapal.lz");
+const u32 gMonShinyPalette_MeowsticMale[] = INCBIN_U32("graphics/pokemon/meowstic/male/shiny.gbapal.lz");
+const u32 gMonShinyPalette_MeowsticFemale[] = INCBIN_U32("graphics/pokemon/meowstic/female/shiny.gbapal.lz");
 const u32 gMonShinyPalette_Honedge[] = INCBIN_U32("graphics/pokemon/honedge/shiny.gbapal.lz");
 const u32 gMonShinyPalette_Doublade[] = INCBIN_U32("graphics/pokemon/doublade/shiny.gbapal.lz");
 const u32 gMonShinyPalette_Aegislash[] = INCBIN_U32("graphics/pokemon/aegislash/shiny.gbapal.lz");
@@ -3821,7 +3845,12 @@ const u8 gMonIcon_Gallade[] = INCBIN_U8("graphics/pokemon/gallade/icon.4bpp");
 const u8 gMonIcon_Probopass[] = INCBIN_U8("graphics/pokemon/probopass/icon.4bpp");
 const u8 gMonIcon_Dusknoir[] = INCBIN_U8("graphics/pokemon/dusknoir/icon.4bpp");
 const u8 gMonIcon_Froslass[] = INCBIN_U8("graphics/pokemon/froslass/icon.4bpp");
-const u8 gMonIcon_Rotom[] = INCBIN_U8("graphics/pokemon/rotom/icon.4bpp");
+const u8 gMonIcon_RotomNormal[] = INCBIN_U8("graphics/pokemon/rotom/normal/icon.4bpp");
+const u8 gMonIcon_RotomHeat[] = INCBIN_U8("graphics/pokemon/rotom/heat/icon.4bpp");
+const u8 gMonIcon_RotomFrost[] = INCBIN_U8("graphics/pokemon/rotom/frost/icon.4bpp");
+const u8 gMonIcon_RotomFan[] = INCBIN_U8("graphics/pokemon/rotom/fan/icon.4bpp");
+const u8 gMonIcon_RotomMow[] = INCBIN_U8("graphics/pokemon/rotom/mow/icon.4bpp");
+const u8 gMonIcon_RotomWash[] = INCBIN_U8("graphics/pokemon/rotom/wash/icon.4bpp");
 const u8 gMonIcon_Uxie[] = INCBIN_U8("graphics/pokemon/uxie/icon.4bpp");
 const u8 gMonIcon_Mesprit[] = INCBIN_U8("graphics/pokemon/mesprit/icon.4bpp");
 const u8 gMonIcon_Azelf[] = INCBIN_U8("graphics/pokemon/azelf/icon.4bpp");
@@ -4020,7 +4049,8 @@ const u8 gMonIcon_Pancham[] = INCBIN_U8("graphics/pokemon/pancham/icon.4bpp");
 const u8 gMonIcon_Pangoro[] = INCBIN_U8("graphics/pokemon/pangoro/icon.4bpp");
 const u8 gMonIcon_Furfrou[] = INCBIN_U8("graphics/pokemon/furfrou/icon.4bpp");
 const u8 gMonIcon_Espurr[] = INCBIN_U8("graphics/pokemon/espurr/icon.4bpp");
-const u8 gMonIcon_Meowstic[] = INCBIN_U8("graphics/pokemon/meowstic/icon.4bpp");
+const u8 gMonIcon_MeowsticMale[] = INCBIN_U8("graphics/pokemon/meowstic/male/icon.4bpp");
+const u8 gMonIcon_MeowsticFemale[] = INCBIN_U8("graphics/pokemon/meowstic/female/icon.4bpp");
 const u8 gMonIcon_Honedge[] = INCBIN_U8("graphics/pokemon/honedge/icon.4bpp");
 const u8 gMonIcon_Doublade[] = INCBIN_U8("graphics/pokemon/doublade/icon.4bpp");
 const u8 gMonIcon_Aegislash[] = INCBIN_U8("graphics/pokemon/aegislash/icon.4bpp");

src/data/pokemon/base_stats.h

@@ -12052,6 +12052,126 @@ const struct BaseStats gBaseStats[] =
 		.bodyColor = BODY_COLOR_RED,
 	},
 
+	[SPECIES_ROTOM_HEAT] =
+	{
+		.baseHP        = 50,
+		.baseAttack    = 65,
+		.baseDefense   = 107,
+		.baseSpeed     = 86,
+		.baseSpAttack  = 105,
+		.baseSpDefense = 107,
+		.type1 = TYPE_ELECTRIC,
+		.type2 = TYPE_FIRE,
+		.catchRate = 45,
+		.expYield = 182,
+		.evYield_Speed     = 1,
+		.evYield_SpAttack  = 1,
+		.genderRatio = MON_GENDERLESS,
+		.eggCycles = 20,
+		.friendship = 70,
+		.growthRate = GROWTH_MEDIUM_FAST,
+		.eggGroup1 = EGG_GROUP_AMORPHOUS,
+		.eggGroup2 = EGG_GROUP_AMORPHOUS,
+		.ability1 = ABILITY_LEVITATE,
+		.bodyColor = BODY_COLOR_RED,
+	},
+
+	[SPECIES_ROTOM_WASH] =
+	{
+		.baseHP        = 50,
+		.baseAttack    = 65,
+		.baseDefense   = 107,
+		.baseSpeed     = 86,
+		.baseSpAttack  = 105,
+		.baseSpDefense = 107,
+		.type1 = TYPE_ELECTRIC,
+		.type2 = TYPE_WATER,
+		.catchRate = 45,
+		.expYield = 182,
+		.evYield_Speed     = 1,
+		.evYield_SpAttack  = 1,
+		.genderRatio = MON_GENDERLESS,
+		.eggCycles = 20,
+		.friendship = 70,
+		.growthRate = GROWTH_MEDIUM_FAST,
+		.eggGroup1 = EGG_GROUP_AMORPHOUS,
+		.eggGroup2 = EGG_GROUP_AMORPHOUS,
+		.ability1 = ABILITY_LEVITATE,
+		.bodyColor = BODY_COLOR_RED,
+	},
+
+	[SPECIES_ROTOM_FROST] =
+	{
+		.baseHP        = 50,
+		.baseAttack    = 65,
+		.baseDefense   = 107,
+		.baseSpeed     = 86,
+		.baseSpAttack  = 105,
+		.baseSpDefense = 107,
+		.type1 = TYPE_ELECTRIC,
+		.type2 = TYPE_ICE,
+		.catchRate = 45,
+		.expYield = 182,
+		.evYield_Speed     = 1,
+		.evYield_SpAttack  = 1,
+		.genderRatio = MON_GENDERLESS,
+		.eggCycles = 20,
+		.friendship = 70,
+		.growthRate = GROWTH_MEDIUM_FAST,
+		.eggGroup1 = EGG_GROUP_AMORPHOUS,
+		.eggGroup2 = EGG_GROUP_AMORPHOUS,
+		.ability1 = ABILITY_LEVITATE,
+		.bodyColor = BODY_COLOR_RED,
+	},
+
+	[SPECIES_ROTOM_FAN] =
+	{
+		.baseHP        = 50,
+		.baseAttack    = 65,
+		.baseDefense   = 107,
+		.baseSpeed     = 86,
+		.baseSpAttack  = 105,
+		.baseSpDefense = 107,
+		.type1 = TYPE_ELECTRIC,
+		.type2 = TYPE_FLYING,
+		.catchRate = 45,
+		.expYield = 182,
+		.evYield_Speed     = 1,
+		.evYield_SpAttack  = 1,
+		.genderRatio = MON_GENDERLESS,
+		.eggCycles = 20,
+		.friendship = 70,
+		.growthRate = GROWTH_MEDIUM_FAST,
+		.eggGroup1 = EGG_GROUP_AMORPHOUS,
+		.eggGroup2 = EGG_GROUP_AMORPHOUS,
+		.ability1 = ABILITY_LEVITATE,
+		.bodyColor = BODY_COLOR_RED,
+	},
+
+	[SPECIES_ROTOM_MOW] =
+	{
+		.baseHP        = 50,
+		.baseAttack    = 65,
+		.baseDefense   = 107,
+		.baseSpeed     = 86,
+		.baseSpAttack  = 105,
+		.baseSpDefense = 107,
+		.type1 = TYPE_ELECTRIC,
+		.type2 = TYPE_GRASS,
+		.catchRate = 45,
+		.expYield = 182,
+		.evYield_Speed     = 1,
+		.evYield_SpAttack  = 1,
+		.genderRatio = MON_GENDERLESS,
+		.eggCycles = 20,
+		.friendship = 70,
+		.growthRate = GROWTH_MEDIUM_FAST,
+		.eggGroup1 = EGG_GROUP_AMORPHOUS,
+		.eggGroup2 = EGG_GROUP_AMORPHOUS,
+		.ability1 = ABILITY_LEVITATE,
+		.bodyColor = BODY_COLOR_RED,
+	},
+
 	[SPECIES_UXIE] =
 	{
 		.baseHP        = 75,
@@ -16194,6 +16314,52 @@ const struct BaseStats gBaseStats[] =
 		.bodyColor = BODY_COLOR_GRAY,
 	},
 
+	[SPECIES_KYUREM_WHITE] =
+	{
+		.baseHP        = 125,
+		.baseAttack    = 120,
+		.baseDefense   = 90,
+		.baseSpeed     = 95,
+		.baseSpAttack  = 170,
+		.baseSpDefense = 100,
+		.type1 = TYPE_DRAGON,
+		.type2 = TYPE_ICE,
+		.catchRate = 3,
+		.expYield = 315,
+		.evYield_SpAttack  = 3,
+		.genderRatio = MON_GENDERLESS,
+		.eggCycles = 120,
+		.friendship = 0,
+		.growthRate = GROWTH_SLOW,
+		.eggGroup1 = EGG_GROUP_UNDISCOVERED,
+		.eggGroup2 = EGG_GROUP_UNDISCOVERED,
+		.ability1 = ABILITY_TURBOBLAZE,
+		.bodyColor = BODY_COLOR_GRAY,
+	},
+
+	[SPECIES_KYUREM_BLACK] =
+	{
+		.baseHP        = 125,
+		.baseAttack    = 170,
+		.baseDefense   = 100,
+		.baseSpeed     = 95,
+		.baseSpAttack  = 120,
+		.baseSpDefense = 90,
+		.type1 = TYPE_DRAGON,
+		.type2 = TYPE_ICE,
+		.catchRate = 3,
+		.expYield = 315,
+		.evYield_Attack    = 3,
+		.genderRatio = MON_GENDERLESS,
+		.eggCycles = 120,
+		.friendship = 0,
+		.growthRate = GROWTH_SLOW,
+		.eggGroup1 = EGG_GROUP_UNDISCOVERED,
+		.eggGroup2 = EGG_GROUP_UNDISCOVERED,
+		.ability1 = ABILITY_TERAVOLT,
+		.bodyColor = BODY_COLOR_GRAY,
+	},
+
 	[SPECIES_KELDEO] =
 	{
 		.baseHP        = 91,
@@ -16960,7 +17126,7 @@ const struct BaseStats gBaseStats[] =
 		.expYield = 163,
 		.evYield_Speed     = 2,
 		.evYield_SpAttack  = 0,
-		.genderRatio = PERCENT_FEMALE(50),
+		.genderRatio = PERCENT_FEMALE(0),
 		.eggCycles = 20,
 		.friendship = 70,
 		.growthRate = GROWTH_MEDIUM_FAST,
@@ -16971,6 +17137,30 @@ const struct BaseStats gBaseStats[] =
 		.bodyColor = BODY_COLOR_BLUE,
 	},
 
+    [SPECIES_MEOWSTIC_F] =
+	{
+		.baseHP        = 74,
+		.baseAttack    = 48,
+		.baseDefense   = 76,
+		.baseSpeed     = 104,
+		.baseSpAttack  = 83,
+		.baseSpDefense = 81,
+		.type1 = TYPE_PSYCHIC,
+		.type2 = TYPE_PSYCHIC,
+		.catchRate = 75,
+		.expYield = 163,
+		.evYield_Speed     = 2,
+		.genderRatio = PERCENT_FEMALE(100),
+		.eggCycles = 20,
+		.friendship = 70,
+		.growthRate = GROWTH_MEDIUM_FAST,
+		.eggGroup1 = EGG_GROUP_FIELD,
+		.eggGroup2 = EGG_GROUP_FIELD,
+		.ability1 = ABILITY_KEEN_EYE,
+		.ability2 = ABILITY_INFILTRATOR,
+		.bodyColor = BODY_COLOR_WHITE,
+	},
+
 	[SPECIES_HONEDGE] =
 	{
 		.baseHP        = 45,

src/data/pokemon/evolution.h

@@ -394,7 +394,7 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] =
 	[SPECIES_SKIDDO]	 = {{EVO_LEVEL, 32, SPECIES_GOGOAT}},
 	[SPECIES_PANCHAM]	 = {{EVO_LEVEL_SPECIFIC_MON_TYPE_IN_PARTY, 32, SPECIES_PANGORO}},
 	[SPECIES_ESPURR]	 = {{EVO_LEVEL_MALE, 25, SPECIES_MEOWSTIC},
-                            {EVO_LEVEL_FEMALE, 25, SPECIES_MEOWSTIC}},
+                            {EVO_LEVEL_FEMALE, 25, SPECIES_MEOWSTIC_F}},
 	[SPECIES_HONEDGE]	 = {{EVO_LEVEL, 35, SPECIES_DOUBLADE}},
 	[SPECIES_DOUBLADE]	 = {{EVO_ITEM, ITEM_NONE,/*DUSK_STONE*/ SPECIES_AEGISLASH}},
 	[SPECIES_SPRITZEE]	 = {{EVO_TRADE_ITEM, ITEM_NONE,/*ITEM_SACHET*/ SPECIES_AROMATISSE}},

src/data/pokemon_graphics/back_pic_table.h

@@ -483,7 +483,12 @@ const struct CompressedSpriteSheet gMonBackPicTable[] =
     SPECIES_SPRITE(PROBOPASS, gMonBackPic_Probopass),
     SPECIES_SPRITE(DUSKNOIR, gMonBackPic_Dusknoir),
     SPECIES_SPRITE(FROSLASS, gMonBackPic_Froslass),
-    SPECIES_SPRITE(ROTOM, gMonBackPic_Rotom),
+    SPECIES_SPRITE(ROTOM, gMonBackPic_RotomNormal),
+    SPECIES_SPRITE(ROTOM_HEAT, gMonBackPic_RotomHeat),
+    SPECIES_SPRITE(ROTOM_FROST, gMonBackPic_RotomFrost),
+    SPECIES_SPRITE(ROTOM_FAN, gMonBackPic_RotomFan),
+    SPECIES_SPRITE(ROTOM_MOW, gMonBackPic_RotomMow),
+    SPECIES_SPRITE(ROTOM_WASH, gMonBackPic_RotomWash),
     SPECIES_SPRITE(UXIE, gMonBackPic_Uxie),
     SPECIES_SPRITE(MESPRIT, gMonBackPic_Mesprit),
     SPECIES_SPRITE(AZELF, gMonBackPic_Azelf),
@@ -682,7 +687,8 @@ const struct CompressedSpriteSheet gMonBackPicTable[] =
     SPECIES_SPRITE(PANGORO, gMonBackPic_Pangoro),
     SPECIES_SPRITE(FURFROU, gMonBackPic_Furfrou),
     SPECIES_SPRITE(ESPURR, gMonBackPic_Espurr),
-    SPECIES_SPRITE(MEOWSTIC, gMonBackPic_Meowstic),
+    SPECIES_SPRITE(MEOWSTIC, gMonBackPic_MeowsticMale),
+    SPECIES_SPRITE(MEOWSTIC_F, gMonBackPic_MeowsticFemale),
     SPECIES_SPRITE(HONEDGE, gMonBackPic_Honedge),
     SPECIES_SPRITE(DOUBLADE, gMonBackPic_Doublade),
     SPECIES_SPRITE(AEGISLASH, gMonBackPic_Aegislash),

src/data/pokemon_graphics/front_pic_anims.h

@@ -5559,6 +5559,70 @@ static const union AnimCmd sAnim_ROTOM_1[] =
     ANIMCMD_END,
 };
 
+static const union AnimCmd sAnim_RotomHeat_1[] =
+{
+    ANIMCMD_FRAME(0, 30),
+    ANIMCMD_FRAME(1, 30),
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sAnim_RotomFrost_1[] =
+{
+    ANIMCMD_FRAME(0, 30),
+    ANIMCMD_FRAME(1, 30),
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sAnim_RotomFan_1[] =
+{
+    ANIMCMD_FRAME(0, 2),
+    ANIMCMD_FRAME(1, 2),
+    ANIMCMD_FRAME(0, 2),
+    ANIMCMD_FRAME(1, 2),
+    ANIMCMD_FRAME(0, 2),
+    ANIMCMD_FRAME(1, 2),
+    ANIMCMD_FRAME(0, 2),
+    ANIMCMD_FRAME(1, 6),
+    ANIMCMD_FRAME(0, 2),
+    ANIMCMD_FRAME(1, 5),
+    ANIMCMD_FRAME(0, 2),
+    ANIMCMD_FRAME(1, 4),
+    ANIMCMD_FRAME(0, 2),
+    ANIMCMD_FRAME(1, 3),
+    ANIMCMD_FRAME(0, 2),
+    ANIMCMD_FRAME(1, 10),
+    ANIMCMD_FRAME(0, 2),
+    ANIMCMD_FRAME(1, 2),
+    ANIMCMD_FRAME(0, 2),
+    ANIMCMD_FRAME(1, 2),
+    ANIMCMD_FRAME(0, 2),
+    ANIMCMD_FRAME(1, 2),
+    ANIMCMD_FRAME(0, 2),
+    ANIMCMD_FRAME(1, 2),
+    ANIMCMD_FRAME(0, 2),
+    ANIMCMD_FRAME(1, 10),
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sAnim_RotomMow_1[] =
+{
+    ANIMCMD_FRAME(0, 30),
+    ANIMCMD_FRAME(1, 30),
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sAnim_RotomWash_1[] =
+{
+    ANIMCMD_FRAME(0, 30),
+    ANIMCMD_FRAME(1, 30),
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_END,
+};
+
 static const union AnimCmd sAnim_UXIE_1[] =
 {
     ANIMCMD_FRAME(0, 30),
@@ -10398,6 +10462,31 @@ static const union AnimCmd *const sAnims_ROTOM[] ={
     sAnim_ROTOM_1,
 };
 
+static const union AnimCmd *const sAnims_ROTOM_HEAT[] ={
+    sAnim_GeneralFrame0,
+    sAnim_RotomHeat_1,
+};
+
+static const union AnimCmd *const sAnims_ROTOM_FROST[] ={
+    sAnim_GeneralFrame0,
+    sAnim_RotomFrost_1,
+};
+
+static const union AnimCmd *const sAnims_ROTOM_FAN[] ={
+    sAnim_GeneralFrame0,
+    sAnim_RotomFan_1,
+};
+
+static const union AnimCmd *const sAnims_ROTOM_MOW[] ={
+    sAnim_GeneralFrame0,
+    sAnim_RotomMow_1,
+};
+
+static const union AnimCmd *const sAnims_ROTOM_WASH[] ={
+    sAnim_GeneralFrame0,
+    sAnim_RotomWash_1,
+};
+
 static const union AnimCmd *const sAnims_UXIE[] ={
     sAnim_GeneralFrame0,
     sAnim_UXIE_1,
@@ -12527,6 +12616,11 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[] =
     ANIM_CMD(DUSKNOIR),
     ANIM_CMD(FROSLASS),
     ANIM_CMD(ROTOM),
+    ANIM_CMD(ROTOM_WASH),
+    ANIM_CMD(ROTOM_MOW),
+    ANIM_CMD(ROTOM_FAN),
+    ANIM_CMD(ROTOM_FROST),
+    ANIM_CMD(ROTOM_HEAT),
     ANIM_CMD(UXIE),
     ANIM_CMD(MESPRIT),
     ANIM_CMD(AZELF),

src/data/pokemon_graphics/front_pic_table.h

@@ -483,7 +483,12 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] =
     SPECIES_SPRITE(PROBOPASS, gMonFrontPic_Probopass),
     SPECIES_SPRITE(DUSKNOIR, gMonFrontPic_Dusknoir),
     SPECIES_SPRITE(FROSLASS, gMonFrontPic_Froslass),
-    SPECIES_SPRITE(ROTOM, gMonFrontPic_Rotom),
+    SPECIES_SPRITE(ROTOM, gMonFrontPic_RotomNormal),
+    SPECIES_SPRITE(ROTOM_HEAT, gMonFrontPic_RotomHeat),
+    SPECIES_SPRITE(ROTOM_FROST, gMonFrontPic_RotomFrost),
+    SPECIES_SPRITE(ROTOM_FAN, gMonFrontPic_RotomFan),
+    SPECIES_SPRITE(ROTOM_MOW, gMonFrontPic_RotomMow),
+    SPECIES_SPRITE(ROTOM_WASH, gMonFrontPic_RotomWash),
     SPECIES_SPRITE(UXIE, gMonFrontPic_Uxie),
     SPECIES_SPRITE(MESPRIT, gMonFrontPic_Mesprit),
     SPECIES_SPRITE(AZELF, gMonFrontPic_Azelf),
@@ -682,7 +687,8 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] =
     SPECIES_SPRITE(PANGORO, gMonFrontPic_Pangoro),
     SPECIES_SPRITE(FURFROU, gMonFrontPic_Furfrou),
     SPECIES_SPRITE(ESPURR, gMonFrontPic_Espurr),
-    SPECIES_SPRITE(MEOWSTIC, gMonFrontPic_Meowstic),
+    SPECIES_SPRITE(MEOWSTIC, gMonFrontPic_MeowsticMale),
+    SPECIES_SPRITE(MEOWSTIC_F, gMonFrontPic_MeowsticFemale),
     SPECIES_SPRITE(HONEDGE, gMonFrontPic_Honedge),
     SPECIES_SPRITE(DOUBLADE, gMonFrontPic_Doublade),
     SPECIES_SPRITE(AEGISLASH, gMonFrontPic_Aegislash),

src/data/pokemon_graphics/palette_table.h

@@ -483,7 +483,12 @@ const struct CompressedSpritePalette gMonPaletteTable[] =
     SPECIES_PAL(PROBOPASS, gMonPalette_Probopass),
     SPECIES_PAL(DUSKNOIR, gMonPalette_Dusknoir),
     SPECIES_PAL(FROSLASS, gMonPalette_Froslass),
-    SPECIES_PAL(ROTOM, gMonPalette_Rotom),
+    SPECIES_PAL(ROTOM, gMonPalette_RotomNormal),
+    SPECIES_PAL(ROTOM_HEAT, gMonPalette_RotomHeat),
+    SPECIES_PAL(ROTOM_FROST, gMonPalette_RotomFrost),
+    SPECIES_PAL(ROTOM_FAN, gMonPalette_RotomFan),
+    SPECIES_PAL(ROTOM_MOW, gMonPalette_RotomMow),
+    SPECIES_PAL(ROTOM_WASH, gMonPalette_RotomWash),
     SPECIES_PAL(UXIE, gMonPalette_Uxie),
     SPECIES_PAL(MESPRIT, gMonPalette_Mesprit),
     SPECIES_PAL(AZELF, gMonPalette_Azelf),
@@ -682,7 +687,8 @@ const struct CompressedSpritePalette gMonPaletteTable[] =
     SPECIES_PAL(PANGORO, gMonPalette_Pangoro),
     SPECIES_PAL(FURFROU, gMonPalette_Furfrou),
     SPECIES_PAL(ESPURR, gMonPalette_Espurr),
-    SPECIES_PAL(MEOWSTIC, gMonPalette_Meowstic),
+    SPECIES_PAL(MEOWSTIC, gMonPalette_MeowsticMale),
+    SPECIES_PAL(MEOWSTIC_F, gMonPalette_MeowsticFemale),
     SPECIES_PAL(HONEDGE, gMonPalette_Honedge),
     SPECIES_PAL(DOUBLADE, gMonPalette_Doublade),
     SPECIES_PAL(AEGISLASH, gMonPalette_Aegislash),

src/data/pokemon_graphics/shiny_palette_table.h

@@ -483,7 +483,12 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] =
     SPECIES_SHINY_PAL(PROBOPASS, gMonShinyPalette_Probopass),
     SPECIES_SHINY_PAL(DUSKNOIR, gMonShinyPalette_Dusknoir),
     SPECIES_SHINY_PAL(FROSLASS, gMonShinyPalette_Froslass),
-    SPECIES_SHINY_PAL(ROTOM, gMonShinyPalette_Rotom),
+    SPECIES_SHINY_PAL(ROTOM, gMonShinyPalette_RotomNormal),
+    SPECIES_SHINY_PAL(ROTOM_HEAT, gMonShinyPalette_RotomHeat),
+    SPECIES_SHINY_PAL(ROTOM_FROST, gMonShinyPalette_RotomFrost),
+    SPECIES_SHINY_PAL(ROTOM_FAN, gMonShinyPalette_RotomFan),
+    SPECIES_SHINY_PAL(ROTOM_MOW, gMonShinyPalette_RotomMow),
+    SPECIES_SHINY_PAL(ROTOM_WASH, gMonShinyPalette_RotomWash),
     SPECIES_SHINY_PAL(UXIE, gMonShinyPalette_Uxie),
     SPECIES_SHINY_PAL(MESPRIT, gMonShinyPalette_Mesprit),
     SPECIES_SHINY_PAL(AZELF, gMonShinyPalette_Azelf),
@@ -682,7 +687,8 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] =
     SPECIES_SHINY_PAL(PANGORO, gMonShinyPalette_Pangoro),
     SPECIES_SHINY_PAL(FURFROU, gMonShinyPalette_Furfrou),
     SPECIES_SHINY_PAL(ESPURR, gMonShinyPalette_Espurr),
-    SPECIES_SHINY_PAL(MEOWSTIC, gMonShinyPalette_Meowstic),
+    SPECIES_SHINY_PAL(MEOWSTIC, gMonShinyPalette_MeowsticMale),
+    SPECIES_SHINY_PAL(MEOWSTIC_F, gMonShinyPalette_MeowsticFemale),
     SPECIES_SHINY_PAL(HONEDGE, gMonShinyPalette_Honedge),
     SPECIES_SHINY_PAL(DOUBLADE, gMonShinyPalette_Doublade),
     SPECIES_SHINY_PAL(AEGISLASH, gMonShinyPalette_Aegislash),

src/data/text/species_names.h

@@ -412,7 +412,11 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = {
     [SPECIES_SHIELDON] = _("Shieldon"),
     [SPECIES_BASTIODON] = _("Bastiodon"),
     [SPECIES_BURMY] = _("Burmy"),
+    [SPECIES_BURMY_SANDY] = _("Burmy"),
+    [SPECIES_BURMY_TRASH] = _("Burmy"),
     [SPECIES_WORMADAM] = _("Wormadam"),
+    [SPECIES_WORMADAM_SANDY] = _("Wormadam"),
+    [SPECIES_WORMADAM_TRASH] = _("Wormadam"),
     [SPECIES_MOTHIM] = _("Mothim"),
     [SPECIES_COMBEE] = _("Combee"),
     [SPECIES_VESPIQUEN] = _("Vespiquen"),
@@ -479,6 +483,11 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = {
     [SPECIES_DUSKNOIR] = _("Dusknoir"),
     [SPECIES_FROSLASS] = _("Froslass"),
     [SPECIES_ROTOM] = _("Rotom"),
+    [SPECIES_ROTOM_HEAT] = _("Rotom"),
+    [SPECIES_ROTOM_FAN] = _("Rotom"),
+    [SPECIES_ROTOM_FROST] = _("Rotom"),
+    [SPECIES_ROTOM_MOW] = _("Rotom"),
+    [SPECIES_ROTOM_WASH] = _("Rotom"),
     [SPECIES_UXIE] = _("Uxie"),
     [SPECIES_MESPRIT] = _("Mesprit"),
     [SPECIES_AZELF] = _("Azelf"),
@@ -646,6 +655,8 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = {
     [SPECIES_ZEKROM] = _("Zekrom"),
     [SPECIES_LANDORUS] = _("Landorus"),
     [SPECIES_KYUREM] = _("Kyurem"),
+    [SPECIES_KYUREM_BLACK] = _("Kyurem"),
+    [SPECIES_KYUREM_WHITE] = _("Kyurem"),
     [SPECIES_KELDEO] = _("Keldeo"),
     [SPECIES_MELOETTA] = _("Meloetta"),
     [SPECIES_GENESECT] = _("Genesect"),
@@ -678,6 +689,7 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = {
     [SPECIES_FURFROU] = _("Furfrou"),
     [SPECIES_ESPURR] = _("Espurr"),
     [SPECIES_MEOWSTIC] = _("Meowstic"),
+    [SPECIES_MEOWSTIC_F] = _("Meowstic"),
     [SPECIES_HONEDGE] = _("Honedge"),
     [SPECIES_DOUBLADE] = _("Doublade"),
     [SPECIES_AEGISLASH] = _("Aegislash"),

src/pokemon.c

@@ -710,11 +710,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_BURMY_SANDY - 1] = NATIONAL_DEX_BURMY,
+	[SPECIES_BURMY_TRASH - 1] = NATIONAL_DEX_BURMY,
 	SPECIES_TO_NATIONAL(WORMADAM),
-	[SPECIES_WORMADAM_SANDY] = NATIONAL_DEX_WORMADAM,
-	[SPECIES_WORMADAM_TRASH] = NATIONAL_DEX_WORMADAM,
+	[SPECIES_WORMADAM_SANDY - 1] = NATIONAL_DEX_WORMADAM,
+	[SPECIES_WORMADAM_TRASH - 1] = NATIONAL_DEX_WORMADAM,
 	SPECIES_TO_NATIONAL(MOTHIM),
 	SPECIES_TO_NATIONAL(COMBEE),
 	SPECIES_TO_NATIONAL(VESPIQUEN),
@@ -781,6 +781,11 @@ const u16 gSpeciesToNationalPokedexNum[NUM_SPECIES] = // Assigns all species to
 	SPECIES_TO_NATIONAL(DUSKNOIR),
 	SPECIES_TO_NATIONAL(FROSLASS),
 	SPECIES_TO_NATIONAL(ROTOM),
+	[SPECIES_ROTOM_HEAT - 1] = NATIONAL_DEX_ROTOM,
+	[SPECIES_ROTOM_WASH - 1] = NATIONAL_DEX_ROTOM,
+	[SPECIES_ROTOM_FROST - 1] = NATIONAL_DEX_ROTOM,
+	[SPECIES_ROTOM_FAN - 1] = NATIONAL_DEX_ROTOM,
+	[SPECIES_ROTOM_MOW - 1] = NATIONAL_DEX_ROTOM,
 	SPECIES_TO_NATIONAL(UXIE),
 	SPECIES_TO_NATIONAL(MESPRIT),
 	SPECIES_TO_NATIONAL(AZELF),
@@ -948,6 +953,8 @@ const u16 gSpeciesToNationalPokedexNum[NUM_SPECIES] = // Assigns all species to
 	SPECIES_TO_NATIONAL(ZEKROM),
 	SPECIES_TO_NATIONAL(LANDORUS),
 	SPECIES_TO_NATIONAL(KYUREM),
+	[SPECIES_KYUREM_BLACK - 1] = NATIONAL_DEX_KYUREM,
+	[SPECIES_KYUREM_WHITE - 1] = NATIONAL_DEX_KYUREM,
 	SPECIES_TO_NATIONAL(KELDEO),
 	SPECIES_TO_NATIONAL(MELOETTA),
 	SPECIES_TO_NATIONAL(GENESECT),
@@ -980,6 +987,7 @@ const u16 gSpeciesToNationalPokedexNum[NUM_SPECIES] = // Assigns all species to
 	SPECIES_TO_NATIONAL(FURFROU),
 	SPECIES_TO_NATIONAL(ESPURR),
 	SPECIES_TO_NATIONAL(MEOWSTIC),
+	[SPECIES_MEOWSTIC_F - 1] = NATIONAL_DEX_MEOWSTIC,
 	SPECIES_TO_NATIONAL(HONEDGE),
 	SPECIES_TO_NATIONAL(DOUBLADE),
 	SPECIES_TO_NATIONAL(AEGISLASH),
@@ -1927,6 +1935,13 @@ static const u8 sMonFrontAnimIdsTable[NUM_SPECIES - 1] =
     [SPECIES_STAKATAKA - 1] = 0x09,
     [SPECIES_BLACEPHALON - 1] = 0x8f,
     [SPECIES_ZERAORA - 1] = 0x17,
+
+    // Forms
+    [SPECIES_ROTOM_HEAT - 1] = 0,
+    [SPECIES_ROTOM_FROST - 1] = 0,
+    [SPECIES_ROTOM_FAN - 1] = 43,
+    [SPECIES_ROTOM_MOW - 1] = 0,
+    [SPECIES_ROTOM_WASH - 1] = 0,
 };
 
 static const u8 sMonAnimationDelayTable[NUM_SPECIES - 1] =
@@ -1987,6 +2002,7 @@ static const u8 sMonAnimationDelayTable[NUM_SPECIES - 1] =
     [SPECIES_KYOGRE - 1] = 0x3c,
     [SPECIES_RAYQUAZA - 1] = 0x3c,
     [SPECIES_TAPU_FINI - 1] = 0x5,
+    [SPECIES_ROTOM_FAN - 1] = 0x7,
 };
 
 const u8 gPPUpGetMask[] = {0x03, 0x0c, 0x30, 0xc0}; // Masks for getting PP Up count, also PP Max values

src/pokemon_icon.c

@@ -508,7 +508,12 @@ const u8 *const gMonIconTable[] =
     [SPECIES_PROBOPASS] = gMonIcon_Probopass,
     [SPECIES_DUSKNOIR] = gMonIcon_Dusknoir,
     [SPECIES_FROSLASS] = gMonIcon_Froslass,
-    [SPECIES_ROTOM] = gMonIcon_Rotom,
+    [SPECIES_ROTOM] = gMonIcon_RotomNormal,
+    [SPECIES_ROTOM_HEAT] = gMonIcon_RotomHeat,
+    [SPECIES_ROTOM_FROST] = gMonIcon_RotomFrost,
+    [SPECIES_ROTOM_FAN] = gMonIcon_RotomFan,
+    [SPECIES_ROTOM_MOW] = gMonIcon_RotomMow,
+    [SPECIES_ROTOM_WASH] = gMonIcon_RotomWash,
     [SPECIES_UXIE] = gMonIcon_Uxie,
     [SPECIES_MESPRIT] = gMonIcon_Mesprit,
     [SPECIES_AZELF] = gMonIcon_Azelf,
@@ -707,7 +712,8 @@ const u8 *const gMonIconTable[] =
     [SPECIES_PANGORO] = gMonIcon_Pangoro,
     [SPECIES_FURFROU] = gMonIcon_Furfrou,
     [SPECIES_ESPURR] = gMonIcon_Espurr,
-    [SPECIES_MEOWSTIC] = gMonIcon_Meowstic,
+    [SPECIES_MEOWSTIC] = gMonIcon_MeowsticMale,
+    [SPECIES_MEOWSTIC_F] = gMonIcon_MeowsticFemale,
     [SPECIES_HONEDGE] = gMonIcon_Honedge,
     [SPECIES_DOUBLADE] = gMonIcon_Doublade,
     [SPECIES_AEGISLASH] = gMonIcon_Aegislash,
@@ -1283,7 +1289,11 @@ const u8 gMonIconPaletteIndices[] =
     [SPECIES_SHIELDON] = 1,
     [SPECIES_BASTIODON] = 1,
     [SPECIES_BURMY] = 1,
+    [SPECIES_BURMY_SANDY] = 1,
+    [SPECIES_BURMY_TRASH] = 0,
     [SPECIES_WORMADAM] = 1,
+    [SPECIES_WORMADAM_SANDY] = 1,
+    [SPECIES_WORMADAM_TRASH] = 0,
     [SPECIES_MOTHIM] = 0,
     [SPECIES_COMBEE] = 0,
     [SPECIES_VESPIQUEN] = 0,
@@ -1350,6 +1360,11 @@ const u8 gMonIconPaletteIndices[] =
     [SPECIES_DUSKNOIR] = 2,
     [SPECIES_FROSLASS] = 0,
     [SPECIES_ROTOM] = 0,
+    [SPECIES_ROTOM_HEAT] = 0,
+    [SPECIES_ROTOM_FROST] = 5,
+    [SPECIES_ROTOM_FAN] = 0,
+    [SPECIES_ROTOM_MOW] = 0,
+    [SPECIES_ROTOM_WASH] = 0,
     [SPECIES_UXIE] = 0,
     [SPECIES_MESPRIT] = 0,
     [SPECIES_AZELF] = 0,
@@ -1549,6 +1564,7 @@ const u8 gMonIconPaletteIndices[] =
     [SPECIES_FURFROU] = 0,
     [SPECIES_ESPURR] = 2,
     [SPECIES_MEOWSTIC] = 0,
+    [SPECIES_MEOWSTIC_F] = 0,
     [SPECIES_HONEDGE] = 2,
     [SPECIES_DOUBLADE] = 2,
     [SPECIES_AEGISLASH] = 2,