Add PLA pokemon to Form Species Table, add Kleavor's graphics

graphics/pokemon/kleavor/normal.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+48 32 32
+144 112 112
+16 16 16
+88 64 64
+128 80 40
+224 192 128
+248 248 248
+200 200 168
+192 136 80
+240 224 184
+200 184 144
+160 144 104
+0 0 0
+0 0 0
+0 0 0

graphics/pokemon/kleavor/shiny.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+32 32 32
+104 104 104
+16 16 16
+56 56 56
+72 80 48
+144 168 104
+248 248 248
+200 200 168
+104 128 56
+216 184 104
+184 128 56
+136 80 24
+0 0 0
+0 0 0
+0 0 0

include/graphics.h

@@ -950,7 +950,7 @@ extern const u32 gMonFrontPic_Glastrier[];
 extern const u32 gMonFrontPic_Spectrier[];
 extern const u32 gMonFrontPic_Calyrex[];
 //extern const u32 gMonFrontPic_Wyrdeer[];
-//extern const u32 gMonFrontPic_Kleavor[];
+extern const u32 gMonFrontPic_Kleavor[];
 extern const u32 gMonFrontPic_Ursaluna[];
 //extern const u32 gMonFrontPic_Basculegion[];
 //extern const u32 gMonFrontPic_BasculegionF[];
@@ -2130,7 +2130,7 @@ extern const u32 gMonBackPic_Glastrier[];
 extern const u32 gMonBackPic_Spectrier[];
 extern const u32 gMonBackPic_Calyrex[];
 //extern const u32 gMonBackPic_Wyrdeer[];
-//extern const u32 gMonBackPic_Kleavor[];
+extern const u32 gMonBackPic_Kleavor[];
 extern const u32 gMonBackPic_Ursaluna[];
 //extern const u32 gMonBackPic_Basculegion[];
 //extern const u32 gMonBackPic_BasculegionF[];
@@ -3302,7 +3302,7 @@ extern const u32 gMonPalette_Glastrier[];
 extern const u32 gMonPalette_Spectrier[];
 extern const u32 gMonPalette_Calyrex[];
 //extern const u32 gMonPalette_Wyrdeer[];
-//extern const u32 gMonPalette_Kleavor[];
+extern const u32 gMonPalette_Kleavor[];
 extern const u32 gMonPalette_Ursaluna[];
 //extern const u32 gMonPalette_Basculegion[];
 //extern const u32 gMonPalette_BasculegionF[];
@@ -4502,7 +4502,7 @@ extern const u32 gMonShinyPalette_Glastrier[];
 extern const u32 gMonShinyPalette_Spectrier[];
 extern const u32 gMonShinyPalette_Calyrex[];
 //extern const u32 gMonShinyPalette_Wyrdeer[];
-//extern const u32 gMonShinyPalette_Kleavor[];
+extern const u32 gMonShinyPalette_Kleavor[];
 extern const u32 gMonShinyPalette_Ursaluna[];
 //extern const u32 gMonShinyPalette_Basculegion[];
 //extern const u32 gMonShinyPalette_BasculegionF[];

src/data/graphics/pokemon.h

@@ -913,7 +913,7 @@ const u32 gMonFrontPic_Glastrier[] = INCBIN_U32("graphics/pokemon/glastrier/fron
 const u32 gMonFrontPic_Spectrier[] = INCBIN_U32("graphics/pokemon/spectrier/front.4bpp.lz");
 const u32 gMonFrontPic_Calyrex[] = INCBIN_U32("graphics/pokemon/calyrex/front.4bpp.lz");
 //const u32 gMonFrontPic_Wyrdeer[] = INCBIN_U32("graphics/pokemon/wyrdeer/front.4bpp.lz");
-//const u32 gMonFrontPic_Kleavor[] = INCBIN_U32("graphics/pokemon/kleavor/front.4bpp.lz");
+const u32 gMonFrontPic_Kleavor[] = INCBIN_U32("graphics/pokemon/kleavor/front.4bpp.lz");
 const u32 gMonFrontPic_Ursaluna[] = INCBIN_U32("graphics/pokemon/ursaluna/front.4bpp.lz");
 //const u32 gMonFrontPic_Basculegion[] = INCBIN_U32("graphics/pokemon/basculegion/front.4bpp.lz");
 //const u32 gMonFrontPic_BasculegionF[] = INCBIN_U32("graphics/pokemon/basculegion/frontf.4bpp.lz");
@@ -2093,7 +2093,7 @@ const u32 gMonBackPic_Glastrier[] = INCBIN_U32("graphics/pokemon/glastrier/back.
 const u32 gMonBackPic_Spectrier[] = INCBIN_U32("graphics/pokemon/spectrier/back.4bpp.lz");
 const u32 gMonBackPic_Calyrex[] = INCBIN_U32("graphics/pokemon/calyrex/back.4bpp.lz");
 //const u32 gMonBackPic_Wyrdeer[] = INCBIN_U32("graphics/pokemon/wyrdeer/back.4bpp.lz");
-//const u32 gMonBackPic_Kleavor[] = INCBIN_U32("graphics/pokemon/kleavor/back.4bpp.lz");
+const u32 gMonBackPic_Kleavor[] = INCBIN_U32("graphics/pokemon/kleavor/back.4bpp.lz");
 const u32 gMonBackPic_Ursaluna[] = INCBIN_U32("graphics/pokemon/ursaluna/back.4bpp.lz");
 //const u32 gMonBackPic_Basculegion[] = INCBIN_U32("graphics/pokemon/basculegion/back.4bpp.lz");
 //const u32 gMonBackPic_BasculegionF[] = INCBIN_U32("graphics/pokemon/basculegion/backf.4bpp.lz");
@@ -3265,7 +3265,7 @@ const u32 gMonPalette_Glastrier[] = INCBIN_U32("graphics/pokemon/glastrier/norma
 const u32 gMonPalette_Spectrier[] = INCBIN_U32("graphics/pokemon/spectrier/normal.gbapal.lz");
 const u32 gMonPalette_Calyrex[] = INCBIN_U32("graphics/pokemon/calyrex/normal.gbapal.lz");
 //const u32 gMonPalette_Wyrdeer[] = INCBIN_U32("graphics/pokemon/wyrdeer/normal.gbapal.lz");
-//const u32 gMonPalette_Kleavor[] = INCBIN_U32("graphics/pokemon/kleavor/normal.gbapal.lz");
+const u32 gMonPalette_Kleavor[] = INCBIN_U32("graphics/pokemon/kleavor/normal.gbapal.lz");
 const u32 gMonPalette_Ursaluna[] = INCBIN_U32("graphics/pokemon/ursaluna/normal.gbapal.lz");
 //const u32 gMonPalette_Basculegion[] = INCBIN_U32("graphics/pokemon/basculegion/normal.gbapal.lz");
 //const u32 gMonPalette_BasculegionF[] = INCBIN_U32("graphics/pokemon/basculegion/normalf.gbapal.lz");
@@ -4464,7 +4464,7 @@ const u32 gMonShinyPalette_Glastrier[] = INCBIN_U32("graphics/pokemon/glastrier/
 const u32 gMonShinyPalette_Spectrier[] = INCBIN_U32("graphics/pokemon/spectrier/shiny.gbapal.lz");
 const u32 gMonShinyPalette_Calyrex[] = INCBIN_U32("graphics/pokemon/calyrex/shiny.gbapal.lz");
 //const u32 gMonShinyPalette_Wyrdeer[] = INCBIN_U32("graphics/pokemon/wyrdeer/shiny.gbapal.lz");
-//const u32 gMonShinyPalette_Kleavor[] = INCBIN_U32("graphics/pokemon/kleavor/shiny.gbapal.lz");
+const u32 gMonShinyPalette_Kleavor[] = INCBIN_U32("graphics/pokemon/kleavor/shiny.gbapal.lz");
 const u32 gMonShinyPalette_Ursaluna[] = INCBIN_U32("graphics/pokemon/ursaluna/shiny.gbapal.lz");
 //const u32 gMonShinyPalette_Basculegion[] = INCBIN_U32("graphics/pokemon/basculegion/shiny.gbapal.lz");
 //const u32 gMonShinyPalette_BasculegionF[] = INCBIN_U32("graphics/pokemon/basculegion/shinyf.gbapal.lz");

src/data/pokemon/form_species_table_pointers.h

@@ -18,6 +18,8 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] =
     [SPECIES_MEOWTH] = sMeowthFormSpeciesIdTable,
     [SPECIES_PERSIAN] = sPersianFormSpeciesIdTable,
     [SPECIES_ALAKAZAM] = sAlakazamFormSpeciesIdTable,
+    [SPECIES_GROWLITHE] = sGrowlitheFormSpeciesIdTable,	
+    [SPECIES_ARCANINE] = sArcanineFormSpeciesIdTable,	
     [SPECIES_GEODUDE] = sGeodudeFormSpeciesIdTable,
     [SPECIES_GRAVELER] = sGravelerFormSpeciesIdTable,
     [SPECIES_GOLEM] = sGolemFormSpeciesIdTable,
@@ -29,7 +31,9 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] =
     [SPECIES_GRIMER] = sGrimerFormSpeciesIdTable,
     [SPECIES_MUK] = sMukFormSpeciesIdTable,
     [SPECIES_GENGAR] = sGengarFormSpeciesIdTable,
-    [SPECIES_EXEGGUTOR] = sExeggutorFormSpeciesIdTable,
+    [SPECIES_VOLTORB] = sExeggutorFormSpeciesIdTable,
+    [SPECIES_ELECTRODE] = sVoltorbFormSpeciesIdTable,
+    [SPECIES_EXEGGUTOR] = sElectrodeFormSpeciesIdTable,
     [SPECIES_MAROWAK] = sMarowakFormSpeciesIdTable,
     [SPECIES_WEEZING] = sWeezingFormSpeciesIdTable,
     [SPECIES_KANGASKHAN] = sKangaskhanFormSpeciesIdTable,
@@ -41,9 +45,12 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] =
     [SPECIES_ZAPDOS] = sZapdosFormSpeciesIdTable,
     [SPECIES_MOLTRES] = sMoltresFormSpeciesIdTable,
     [SPECIES_MEWTWO] = sMewtwoFormSpeciesIdTable,
+    [SPECIES_TYPHLOSION] = sTyphlosionFormSpeciesIdTable,
     [SPECIES_PICHU] = sPichuFormSpeciesIdTable,
     [SPECIES_AMPHAROS] = sAmpharosFormSpeciesIdTable,
     [SPECIES_SLOWKING] = sSlowkingFormSpeciesIdTable,
+    [SPECIES_QWILFISH] = sQwilfishFormSpeciesIdTable,
+    [SPECIES_SNEASEL] = sSneaselFormSpeciesIdTable,
     [SPECIES_UNOWN] = sUnownFormSpeciesIdTable,
     [SPECIES_STEELIX] = sSteelixFormSpeciesIdTable,
     [SPECIES_SCIZOR] = sScizorFormSpeciesIdTable,
@@ -88,17 +95,24 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] =
     [SPECIES_ABOMASNOW] = sAbomasnowFormSpeciesIdTable,
     [SPECIES_GALLADE] = sGalladeFormSpeciesIdTable,
     [SPECIES_ROTOM] = sRotomFormSpeciesIdTable,
+    [SPECIES_DIALGA] = sDialgaFormSpeciesIdTable,
+    [SPECIES_PALKIA] = sPalkiaFormSpeciesIdTable,
     [SPECIES_GIRATINA] = sGiratinaFormSpeciesIdTable,
+    [SPECIES_SAMUROTT] = sSamurottFormSpeciesIdTable,
     [SPECIES_SHAYMIN] = sShayminFormSpeciesIdTable,
     [SPECIES_ARCEUS] = sArceusFormSpeciesIdTable,
     [SPECIES_AUDINO] = sAudinoFormSpeciesIdTable,
     [SPECIES_BASCULIN] = sBasculinFormSpeciesIdTable,
+    [SPECIES_LILLIGANT] = sLilligantFormSpeciesIdTable,
     [SPECIES_DARUMAKA] = sDarumakaFormSpeciesIdTable,
     [SPECIES_DARMANITAN] = sDarmanitanFormSpeciesIdTable,
     [SPECIES_YAMASK] = sYamaskFormSpeciesIdTable,	
+    [SPECIES_ZORUA] = sZoruaFormSpeciesIdTable,
+    [SPECIES_ZOROARK] = sZoroarkFormSpeciesIdTable,
     [SPECIES_DEERLING] = sDeerlingFormSpeciesIdTable,
     [SPECIES_SAWSBUCK] = sSawsbuckFormSpeciesIdTable,
     [SPECIES_STUNFISK] = sStunfiskFormSpeciesIdTable,
+    [SPECIES_BRAVIARY] = sBraviaryFormSpeciesIdTable,
     [SPECIES_TORNADUS] = sTornadusFormSpeciesIdTable,
     [SPECIES_THUNDURUS] = sThundurusFormSpeciesIdTable,
     [SPECIES_LANDORUS] = sLandorusFormSpeciesIdTable,
@@ -114,12 +128,16 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] =
     [SPECIES_FURFROU] = sFurfrouFormSpeciesIdTable,
     [SPECIES_MEOWSTIC] = sMeowsticFormSpeciesIdTable,
     [SPECIES_AEGISLASH] = sAegislashFormSpeciesIdTable,
+    [SPECIES_SLIGGOO] = sSliggooFormSpeciesIdTable,
+    [SPECIES_GOODRA] = sGoodraFormSpeciesIdTable,
     [SPECIES_PUMPKABOO] = sPumpkabooFormSpeciesIdTable,
     [SPECIES_GOURGEIST] = sGourgeistFormSpeciesIdTable,
+    [SPECIES_AVALUGG] = sAvaluggFormSpeciesIdTable,	
     [SPECIES_XERNEAS] = sXerneasFormSpeciesIdTable,
     [SPECIES_ZYGARDE] = sZygardeFormSpeciesIdTable,
     [SPECIES_DIANCIE] = sDiancieFormSpeciesIdTable,
     [SPECIES_HOOPA] = sHoopaFormSpeciesIdTable,
+    [SPECIES_DECIDUEYE] = sDecidueyeFormSpeciesIdTable,
     [SPECIES_ORICORIO] = sOricorioFormSpeciesIdTable,
     [SPECIES_ROCKRUFF] = sRockruffFormSpeciesIdTable,
     [SPECIES_LYCANROC] = sLycanrocFormSpeciesIdTable,
@@ -143,6 +161,7 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] =
     [SPECIES_URSHIFU] = sUrshifuFormSpeciesIdTable,
     [SPECIES_ZARUDE] = sZarudeFormSpeciesIdTable,
     [SPECIES_CALYREX] = sCalyrexFormSpeciesIdTable,
+    [SPECIES_ENAMORUS] = sEnamorusFormSpeciesIdTable,
     // Megas
     [SPECIES_VENUSAUR_MEGA] = sVenusaurFormSpeciesIdTable,
     [SPECIES_CHARIZARD_MEGA_X] = sCharizardFormSpeciesIdTable,
@@ -234,6 +253,23 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] =
     [SPECIES_DARMANITAN_GALARIAN] = sDarmanitanFormSpeciesIdTable,
     [SPECIES_YAMASK_GALARIAN] = sYamaskFormSpeciesIdTable,
     [SPECIES_STUNFISK_GALARIAN] = sStunfiskFormSpeciesIdTable,
+    //Hisuian Forms
+    [SPECIES_GROWLITHE_HISUIAN] = sGrowlitheFormSpeciesIdTable,
+    [SPECIES_ARCANINE_HISUIAN] = sArcanineFormSpeciesIdTable,
+    [SPECIES_VOLTORB_HISUIAN] = sVoltorbFormSpeciesIdTable,
+    [SPECIES_ELECTRODE_HISUIAN] = sElectrodeFormSpeciesIdTable,
+    [SPECIES_TYPHLOSION_HISUIAN] = sTyphlosionFormSpeciesIdTable,
+    [SPECIES_QWILFISH_HISUIAN] = sQwilfishFormSpeciesIdTable,
+    [SPECIES_SNEASEL_HISUIAN] = sSneaselFormSpeciesIdTable,
+    [SPECIES_SAMUROTT_HISUIAN] = sSamurottFormSpeciesIdTable,
+    [SPECIES_LILLIGANT_HISUIAN] = sLilligantFormSpeciesIdTable,
+    [SPECIES_ZORUA_HISUIAN] = sZoruaFormSpeciesIdTable,
+    [SPECIES_ZOROARK_HISUIAN] = sZoroarkFormSpeciesIdTable,
+    [SPECIES_BRAVIARY_HISUIAN] = sBraviaryFormSpeciesIdTable,
+    [SPECIES_SLIGGOO_HISUIAN] = sSliggooFormSpeciesIdTable,
+    [SPECIES_GOODRA_HISUIAN] = sGoodraFormSpeciesIdTable,
+    [SPECIES_AVALUGG_HISUIAN] = sAvaluggFormSpeciesIdTable,
+    [SPECIES_DECIDUEYE_HISUIAN] = sDecidueyeFormSpeciesIdTable,
     // Misc Forms
     // Cosplay Pikachu
     [SPECIES_PIKACHU_COSPLAY] = sPikachuFormSpeciesIdTable,
@@ -307,7 +343,9 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] =
     [SPECIES_ROTOM_FROST] = sRotomFormSpeciesIdTable,
     [SPECIES_ROTOM_FAN] = sRotomFormSpeciesIdTable,
     [SPECIES_ROTOM_MOW] = sRotomFormSpeciesIdTable,
-    // Giratina
+    // Origin Forme
+    [SPECIES_DIALGA_ORIGIN] = sDialgaFormSpeciesIdTable,
+    [SPECIES_PALKIA_ORIGIN] = sPalkiaFormSpeciesIdTable,
     [SPECIES_GIRATINA_ORIGIN] = sGiratinaFormSpeciesIdTable,
     // Shaymin
     [SPECIES_SHAYMIN_SKY] = sShayminFormSpeciesIdTable,
@@ -331,6 +369,7 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] =
     [SPECIES_ARCEUS_FAIRY] = sArceusFormSpeciesIdTable,
     // Basculin
     [SPECIES_BASCULIN_BLUE_STRIPED] = sBasculinFormSpeciesIdTable,
+    [SPECIES_BASCULIN_WHITE_STRIPED] = sBasculinFormSpeciesIdTable,
     // Darmanitan
     [SPECIES_DARMANITAN_ZEN_MODE] = sDarmanitanFormSpeciesIdTable,
     [SPECIES_DARMANITAN_ZEN_MODE_GALARIAN] = sDarmanitanFormSpeciesIdTable,
@@ -346,6 +385,7 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] =
     [SPECIES_TORNADUS_THERIAN] = sTornadusFormSpeciesIdTable,
     [SPECIES_THUNDURUS_THERIAN] = sThundurusFormSpeciesIdTable,
     [SPECIES_LANDORUS_THERIAN] = sLandorusFormSpeciesIdTable,
+    [SPECIES_ENAMORUS_THERIAN] = sEnamorusFormSpeciesIdTable,	
     // Kyurem
     [SPECIES_KYUREM_WHITE] = sKyuremFormSpeciesIdTable,
     [SPECIES_KYUREM_BLACK] = sKyuremFormSpeciesIdTable,

src/data/pokemon/form_species_tables.h

@@ -121,6 +121,18 @@ static const u16 sAlakazamFormSpeciesIdTable[] = {
     FORM_SPECIES_END,
 };
 
+static const u16 sGrowlitheFormSpeciesIdTable[] = {
+    SPECIES_GROWLITHE,
+    SPECIES_GROWLITHE_HISUIAN,
+    FORM_SPECIES_END,
+};
+
+static const u16 sArcanineFormSpeciesIdTable[] = {
+    SPECIES_ARCANINE,
+    SPECIES_ARCANINE_HISUIAN,
+    FORM_SPECIES_END,
+};
+
 static const u16 sGeodudeFormSpeciesIdTable[] = {
     SPECIES_GEODUDE,
     SPECIES_GEODUDE_ALOLAN,
@@ -188,6 +200,18 @@ static const u16 sGengarFormSpeciesIdTable[] = {
     FORM_SPECIES_END,
 };
 
+static const u16 sVoltorbFormSpeciesIdTable[] = {
+    SPECIES_VOLTORB,
+    SPECIES_VOLTORB_HISUIAN,
+    FORM_SPECIES_END,
+};
+
+static const u16 sElectrodeFormSpeciesIdTable[] = {
+    SPECIES_ELECTRODE,
+    SPECIES_ELECTRODE_HISUIAN,
+    FORM_SPECIES_END,
+};
+
 static const u16 sExeggutorFormSpeciesIdTable[] = {
     SPECIES_EXEGGUTOR,
     SPECIES_EXEGGUTOR_ALOLAN,
@@ -254,6 +278,12 @@ static const u16 sMoltresFormSpeciesIdTable[] = {
     FORM_SPECIES_END,
 };
 
+static const u16 sTyphlosionFormSpeciesIdTable[] = {
+    SPECIES_TYPHLOSION,
+    SPECIES_TYPHLOSION_HISUIAN,
+    FORM_SPECIES_END,
+};
+
 static const u16 sMewtwoFormSpeciesIdTable[] = {
     SPECIES_MEWTWO,
     SPECIES_MEWTWO_MEGA_X,
@@ -279,6 +309,18 @@ static const u16 sSlowkingFormSpeciesIdTable[] = {
     FORM_SPECIES_END,
 };
 
+static const u16 sQwilfishFormSpeciesIdTable[] = {
+    SPECIES_QWILFISH,
+    SPECIES_QWILFISH_HISUIAN,
+    FORM_SPECIES_END,
+};
+
+static const u16 sSneaselFormSpeciesIdTable[] = {
+    SPECIES_SNEASEL,
+    SPECIES_SNEASEL_HISUIAN,
+    FORM_SPECIES_END,
+};
+
 static const u16 sUnownFormSpeciesIdTable[] = {
     SPECIES_UNOWN,
     SPECIES_UNOWN_B,
@@ -579,12 +621,30 @@ static const u16 sRotomFormSpeciesIdTable[] = {
     FORM_SPECIES_END,
 };
 
+static const u16 sDialgaFormSpeciesIdTable[] = {
+    SPECIES_DIALGA,
+    SPECIES_DIALGA_ORIGIN,
+    FORM_SPECIES_END,
+};
+
+static const u16 sPalkiaFormSpeciesIdTable[] = {
+    SPECIES_PALKIA,
+    SPECIES_PALKIA_ORIGIN,
+    FORM_SPECIES_END,
+};
+
 static const u16 sGiratinaFormSpeciesIdTable[] = {
     SPECIES_GIRATINA,
     SPECIES_GIRATINA_ORIGIN,
     FORM_SPECIES_END,
 };
 
+static const u16 sSamurottFormSpeciesIdTable[] = {
+    SPECIES_SAMUROTT,
+    SPECIES_SAMUROTT_HISUIAN,
+    FORM_SPECIES_END,
+};
+
 static const u16 sShayminFormSpeciesIdTable[] = {
     SPECIES_SHAYMIN,
     SPECIES_SHAYMIN_SKY,
@@ -622,6 +682,13 @@ static const u16 sAudinoFormSpeciesIdTable[] = {
 static const u16 sBasculinFormSpeciesIdTable[] = {
     SPECIES_BASCULIN,
     SPECIES_BASCULIN_BLUE_STRIPED,
+    SPECIES_BASCULIN_WHITE_STRIPED,
+    FORM_SPECIES_END,
+};
+
+static const u16 sLilligantFormSpeciesIdTable[] = {
+    SPECIES_LILLIGANT,
+    SPECIES_LILLIGANT_HISUIAN,
     FORM_SPECIES_END,
 };
 
@@ -645,6 +712,18 @@ static const u16 sYamaskFormSpeciesIdTable[] = {
     FORM_SPECIES_END,
 };
 
+static const u16 sZoruaFormSpeciesIdTable[] = {
+    SPECIES_ZORUA,
+    SPECIES_ZORUA_HISUIAN,
+    FORM_SPECIES_END,
+};
+
+static const u16 sZoroarkFormSpeciesIdTable[] = {
+    SPECIES_ZOROARK,
+    SPECIES_ZOROARK_HISUIAN,
+    FORM_SPECIES_END,
+};
+
 static const u16 sDeerlingFormSpeciesIdTable[] = {
     SPECIES_DEERLING,
     SPECIES_DEERLING_SUMMER,
@@ -667,6 +746,12 @@ static const u16 sStunfiskFormSpeciesIdTable[] = {
     FORM_SPECIES_END,
 };
 
+static const u16 sBraviaryFormSpeciesIdTable[] = {
+    SPECIES_BRAVIARY,
+    SPECIES_BRAVIARY_HISUIAN,
+    FORM_SPECIES_END,
+};
+
 static const u16 sTornadusFormSpeciesIdTable[] = {
     SPECIES_TORNADUS,
     SPECIES_TORNADUS_THERIAN,
@@ -685,6 +770,12 @@ static const u16 sLandorusFormSpeciesIdTable[] = {
     FORM_SPECIES_END,
 };
 
+static const u16 sEnamorusFormSpeciesIdTable[] = {
+    SPECIES_ENAMORUS,
+    SPECIES_ENAMORUS_THERIAN,
+    FORM_SPECIES_END,
+};
+
 static const u16 sKyuremFormSpeciesIdTable[] = {
     SPECIES_KYUREM,
     SPECIES_KYUREM_WHITE,
@@ -798,6 +889,18 @@ static const u16 sAegislashFormSpeciesIdTable[] = {
     FORM_SPECIES_END,
 };
 
+static const u16 sSliggooFormSpeciesIdTable[] = {
+    SPECIES_SLIGGOO,
+    SPECIES_SLIGGOO_HISUIAN,
+    FORM_SPECIES_END,
+};
+
+static const u16 sGoodraFormSpeciesIdTable[] = {
+    SPECIES_GOODRA,
+    SPECIES_GOODRA_HISUIAN,
+    FORM_SPECIES_END,
+};
+
 static const u16 sPumpkabooFormSpeciesIdTable[] = {
     SPECIES_PUMPKABOO,
     SPECIES_PUMPKABOO_SMALL,
@@ -814,6 +917,12 @@ static const u16 sGourgeistFormSpeciesIdTable[] = {
     FORM_SPECIES_END,
 };
 
+static const u16 sAvaluggFormSpeciesIdTable[] = {
+    SPECIES_AVALUGG,
+    SPECIES_AVALUGG_HISUIAN,
+    FORM_SPECIES_END,
+};
+
 static const u16 sXerneasFormSpeciesIdTable[] = {
     SPECIES_XERNEAS,
     SPECIES_XERNEAS_ACTIVE,
@@ -841,6 +950,12 @@ static const u16 sHoopaFormSpeciesIdTable[] = {
     FORM_SPECIES_END,
 };
 
+static const u16 sDecidueyeFormSpeciesIdTable[] = {
+    SPECIES_DECIDUEYE,
+    SPECIES_DECIDUEYE_HISUIAN,
+    FORM_SPECIES_END,
+};
+
 static const u16 sOricorioFormSpeciesIdTable[] = {
     SPECIES_ORICORIO,
     SPECIES_ORICORIO_POM_POM,

src/data/pokemon_graphics/back_pic_coordinates.h

@@ -4506,8 +4506,8 @@ const struct MonCoords gMonBackPicCoords[] =
     },
     [SPECIES_KLEAVOR] =
     {
-        .size = MON_COORDS_SIZE(64, 64),
-        .y_offset = 0,
+        .size = MON_COORDS_SIZE(64, 56),
+        .y_offset = 4,
     },
     [SPECIES_URSALUNA] =
     {

src/data/pokemon_graphics/back_pic_table.h

@@ -900,7 +900,7 @@ const struct CompressedSpriteSheet gMonBackPicTable[] =
     SPECIES_SPRITE(SPECTRIER, gMonBackPic_Spectrier),
     SPECIES_SPRITE(CALYREX, gMonBackPic_Calyrex),
     SPECIES_SPRITE(WYRDEER, gMonBackPic_CircledQuestionMark), //gMonBackPic_Wyrdeer),
-    SPECIES_SPRITE(KLEAVOR, gMonBackPic_CircledQuestionMark), //gMonBackPic_Kleavor),
+    SPECIES_SPRITE(KLEAVOR, gMonBackPic_Kleavor),
     SPECIES_SPRITE(URSALUNA, gMonBackPic_Ursaluna),
     SPECIES_SPRITE(BASCULEGION, gMonBackPic_CircledQuestionMark), //gMonBackPic_Basculegion),
     SPECIES_SPRITE(SNEASLER, gMonBackPic_CircledQuestionMark), //gMonBackPic_Sneasler),

src/data/pokemon_graphics/front_pic_coordinates.h

@@ -4507,7 +4507,7 @@ const struct MonCoords gMonFrontPicCoords[] =
     [SPECIES_KLEAVOR] =
     {
         .size = MON_COORDS_SIZE(64, 64),
-        .y_offset = 0,
+        .y_offset = 2,
     },
     [SPECIES_URSALUNA] =
     {

src/data/pokemon_graphics/front_pic_table.h

@@ -900,7 +900,7 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] =
     SPECIES_SPRITE(SPECTRIER, gMonFrontPic_Spectrier),
     SPECIES_SPRITE(CALYREX, gMonFrontPic_Calyrex),
     SPECIES_SPRITE(WYRDEER, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_Wyrdeer),
-    SPECIES_SPRITE(KLEAVOR, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_Kleavor),
+    SPECIES_SPRITE(KLEAVOR, gMonFrontPic_Kleavor),
     SPECIES_SPRITE(URSALUNA, gMonFrontPic_Ursaluna),
     SPECIES_SPRITE(BASCULEGION, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_Basculegion),
     SPECIES_SPRITE(SNEASLER, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_Sneasler),

src/data/pokemon_graphics/palette_table.h

@@ -900,7 +900,7 @@ const struct CompressedSpritePalette gMonPaletteTable[] =
     SPECIES_PAL(SPECTRIER, gMonPalette_Spectrier),
     SPECIES_PAL(CALYREX, gMonPalette_Calyrex),
     SPECIES_PAL(WYRDEER, gMonPalette_CircledQuestionMark), // gMonPalette_Wyrdeer),
-    SPECIES_PAL(KLEAVOR, gMonPalette_CircledQuestionMark), // gMonPalette_Kleavor),
+    SPECIES_PAL(KLEAVOR, gMonPalette_Kleavor),
     SPECIES_PAL(URSALUNA, gMonPalette_Ursaluna),
     SPECIES_PAL(BASCULEGION, gMonPalette_CircledQuestionMark), // gMonPalette_Basculegion),
     SPECIES_PAL(SNEASLER, gMonPalette_CircledQuestionMark), // gMonPalette_Sneasler),

src/data/pokemon_graphics/shiny_palette_table.h

@@ -900,7 +900,7 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] =
     SPECIES_SHINY_PAL(SPECTRIER, gMonShinyPalette_Spectrier),
     SPECIES_SHINY_PAL(CALYREX, gMonShinyPalette_Calyrex),
     SPECIES_SHINY_PAL(WYRDEER, gMonShinyPalette_CircledQuestionMark), // gMonShinyPalette_Wyrdeer),
-    SPECIES_SHINY_PAL(KLEAVOR, gMonShinyPalette_CircledQuestionMark), // gMonShinyPalette_Kleavor),
+    SPECIES_SHINY_PAL(KLEAVOR, gMonShinyPalette_Kleavor),
     SPECIES_SHINY_PAL(URSALUNA, gMonShinyPalette_Ursaluna),
     SPECIES_SHINY_PAL(BASCULEGION, gMonShinyPalette_CircledQuestionMark), // gMonShinyPalette_Basculegion),
     SPECIES_SHINY_PAL(SNEASLER, gMonShinyPalette_CircledQuestionMark), // gMonShinyPalette_Sneasler),