Lycanroc forms (#268)

* Midnight Lycanroc

* Dusk Lycanroc

graphics/pokemon/lycanroc/normal_dusk.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+48 32 24
+128 104 80
+128 104 88
+16 16 16
+96 72 48
+232 232 208
+191 88 38
+233 130 67
+224 184 160
+248 152 136
+192 176 160
+248 248 248
+29 204 62
+0 0 0
+0 0 0

graphics/pokemon/lycanroc/normal_midnight.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+48 32 24
+128 104 80
+128 104 88
+16 16 16
+96 72 48
+232 232 208
+254 254 254
+230 0 57
+136 168 200
+248 041 114
+192 176 160
+166 0 41
+136 21 94
+0 0 0
+0 0 0

graphics/pokemon/lycanroc/shiny_dusk.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+48 32 24
+128 104 80
+128 104 88
+16 16 16
+96 72 48
+232 232 208
+56 72 96
+96 120 176
+136 168 200
+248 152 136
+192 176 160
+248 248 248
+168 208 32
+0 0 0
+0 0 0

graphics/pokemon/lycanroc/shiny_midnight.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+48 32 24
+128 104 80
+128 104 88
+16 16 16
+96 72 48
+232 232 208
+254 254 254
+37 100 137
+136 168 200
+248 041 114
+192 176 160
+29 66 88
+136 21 94
+0 0 0
+0 0 0

include/constants/species.h

@@ -909,8 +909,10 @@
 #define SPECIES_MINIOR_CORE 899
 #define SPECIES_WISHIWASHI_SCHOOL 900
 #define SPECIES_MIMIKYU_BUSTED 901
+#define SPECIES_LYCANROC_MIDNIGHT 902
+#define SPECIES_LYCANROC_DUSK 903
 
-#define SPECIES_EGG 902
+#define SPECIES_EGG 904
 #define NUM_SPECIES SPECIES_EGG
 
 // Unown forms, not actual species

include/graphics.h

@@ -3709,6 +3709,14 @@ extern const u32 gMonFrontPic_MimikyuBusted[];
 extern const u32 gMonBackPic_MimikyuBusted[];
 extern const u32 gMonPalette_MimikyuBusted[];
 extern const u32 gMonShinyPalette_MimikyuBusted[];
+extern const u32 gMonFrontPic_LycanrocMidnight[];
+extern const u32 gMonBackPic_LycanrocMidnight[];
+extern const u32 gMonPalette_LycanrocMidnight[];
+extern const u32 gMonShinyPalette_LycanrocMidnight[];
+extern const u32 gMonFrontPic_LycanrocDusk[];
+extern const u32 gMonBackPic_LycanrocDusk[];
+extern const u32 gMonPalette_LycanrocDusk[];
+extern const u32 gMonShinyPalette_LycanrocDusk[];
 
 extern const u8 gMonIcon_QuestionMark[];
 extern const u8 gMonIcon_Bulbasaur[];
@@ -4642,6 +4650,8 @@ extern const u8 gMonIcon_WishiwashiSchool[];
 extern const u8 gMonIcon_KyuremBlack[];
 extern const u8 gMonIcon_KyuremWhite[];
 extern const u8 gMonIcon_MimikyuBusted[];
+extern const u8 gMonIcon_LycanrocMidnight[];
+extern const u8 gMonIcon_LycanrocDusk[];
 
 extern const u8 gMonFootprint_QuestionMark[];
 extern const u8 gMonFootprint_Bulbasaur[];

src/data/graphics/pokemon.h

@@ -3672,6 +3672,14 @@ const u32 gMonFrontPic_MimikyuBusted[] = INCBIN_U32("graphics/pokemon/mimikyu/fr
 const u32 gMonBackPic_MimikyuBusted[] = INCBIN_U32("graphics/pokemon/mimikyu/back_busted.4bpp.lz");
 const u32 gMonPalette_MimikyuBusted[] = INCBIN_U32("graphics/pokemon/mimikyu/normal_busted.gbapal.lz");
 const u32 gMonShinyPalette_MimikyuBusted[] = INCBIN_U32("graphics/pokemon/mimikyu/shiny_busted.gbapal.lz");
+const u32 gMonFrontPic_LycanrocMidnight[] = INCBIN_U32("graphics/pokemon/lycanroc/front_midnight.4bpp.lz");
+const u32 gMonBackPic_LycanrocMidnight[] = INCBIN_U32("graphics/pokemon/lycanroc/back_midnight.4bpp.lz");
+const u32 gMonPalette_LycanrocMidnight[] = INCBIN_U32("graphics/pokemon/lycanroc/normal_midnight.gbapal.lz");
+const u32 gMonShinyPalette_LycanrocMidnight[] = INCBIN_U32("graphics/pokemon/lycanroc/shiny_midnight.gbapal.lz");
+const u32 gMonFrontPic_LycanrocDusk[] = INCBIN_U32("graphics/pokemon/lycanroc/front_dusk.4bpp.lz");
+const u32 gMonBackPic_LycanrocDusk[] = INCBIN_U32("graphics/pokemon/lycanroc/back_dusk.4bpp.lz");
+const u32 gMonPalette_LycanrocDusk[] = INCBIN_U32("graphics/pokemon/lycanroc/normal_dusk.gbapal.lz");
+const u32 gMonShinyPalette_LycanrocDusk[] = INCBIN_U32("graphics/pokemon/lycanroc/shiny_dusk.gbapal.lz");
 
 const u8 gMonIcon_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mark/icon.4bpp");
 const u8 gMonIcon_Bulbasaur[] = INCBIN_U8("graphics/pokemon/bulbasaur/icon.4bpp");
@@ -4605,6 +4613,8 @@ const u8 gMonIcon_WishiwashiSchool[] = INCBIN_U8("graphics/pokemon/wishiwashi/ic
 const u8 gMonIcon_KyuremBlack[] = INCBIN_U8("graphics/pokemon/kyurem/icon_black.4bpp");
 const u8 gMonIcon_KyuremWhite[] = INCBIN_U8("graphics/pokemon/kyurem/icon_white.4bpp");
 const u8 gMonIcon_MimikyuBusted[] = INCBIN_U8("graphics/pokemon/mimikyu/icon_busted.4bpp");
+const u8 gMonIcon_LycanrocMidnight[] = INCBIN_U8("graphics/pokemon/lycanroc/icon_midnight.4bpp");
+const u8 gMonIcon_LycanrocDusk[] = INCBIN_U8("graphics/pokemon/lycanroc/icon_dusk.4bpp");
 
 const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mark/footprint.1bpp");
 const u8 gMonFootprint_Bulbasaur[] = INCBIN_U8("graphics/pokemon/bulbasaur/footprint.1bpp");

src/data/pokemon/base_stats.h

@@ -22501,4 +22501,54 @@ const struct BaseStats gBaseStats[] =
         .abilities = {ABILITY_DISGUISE, ABILITY_NONE},
         .bodyColor = BODY_COLOR_YELLOW,
     },
+
+    [SPECIES_LYCANROC_MIDNIGHT] =
+    {
+        .baseHP        = 85,
+        .baseAttack    = 115,
+        .baseDefense   = 75,
+        .baseSpeed     = 82,
+        .baseSpAttack  = 55,
+        .baseSpDefense = 75,
+        .type1 = TYPE_ROCK,
+        .type2 = TYPE_ROCK,
+        .catchRate = 90,
+        .expYield = 170,
+        .evYield_Attack    = 2,
+        .evYield_SpAttack  = 0,
+        .genderRatio = PERCENT_FEMALE(50),
+        .eggCycles = 15,
+        .friendship = 70,
+        .growthRate = GROWTH_MEDIUM_FAST,
+        .eggGroup1 = EGG_GROUP_FIELD,
+        .eggGroup2 = EGG_GROUP_FIELD,
+        .abilities = {ABILITY_KEEN_EYE, ABILITY_VITAL_SPIRIT},
+        .abilityHidden = ABILITY_NO_GUARD,
+        .bodyColor = BODY_COLOR_BROWN,
+    },
+
+    [SPECIES_LYCANROC_DUSK] =
+    {
+        .baseHP        = 75,
+        .baseAttack    = 117,
+        .baseDefense   = 65,
+        .baseSpeed     = 110,
+        .baseSpAttack  = 55,
+        .baseSpDefense = 65,
+        .type1 = TYPE_ROCK,
+        .type2 = TYPE_ROCK,
+        .catchRate = 90,
+        .expYield = 170,
+        .evYield_Attack    = 2,
+        .evYield_SpAttack  = 0,
+        .genderRatio = PERCENT_FEMALE(50),
+        .eggCycles = 15,
+        .friendship = 70,
+        .growthRate = GROWTH_MEDIUM_FAST,
+        .eggGroup1 = EGG_GROUP_FIELD,
+        .eggGroup2 = EGG_GROUP_FIELD,
+        .abilities = {ABILITY_TOUGH_CLAWS, ABILITY_TOUGH_CLAWS},
+        .abilityHidden = ABILITY_TOUGH_CLAWS,
+        .bodyColor = BODY_COLOR_BROWN,
+    },
 };

src/data/pokemon/evolution.h

@@ -431,8 +431,8 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] =
 	[SPECIES_CRABRAWLER] = {{EVO_MAP, 67, SPECIES_CRABOMINABLE}},
 	[SPECIES_CUTIEFLY]	 = {{EVO_LEVEL, 25, SPECIES_RIBOMBEE}},
 	[SPECIES_ROCKRUFF]	 = {{EVO_LEVEL_DAY, 25, SPECIES_LYCANROC},
-                            {EVO_LEVEL_NIGHT, 25, SPECIES_LYCANROC},
-                            {EVO_LEVEL_DUSK, 25, SPECIES_LYCANROC}},
+                            {EVO_LEVEL_NIGHT, 25, SPECIES_LYCANROC_MIDNIGHT},
+                            {EVO_LEVEL_DUSK, 25, SPECIES_LYCANROC_DUSK}},
 	[SPECIES_MAREANIE]	 = {{EVO_LEVEL, 38, SPECIES_TOXAPEX}},
 	[SPECIES_MUDBRAY]	 = {{EVO_LEVEL, 30, SPECIES_MUDSDALE}},
 	[SPECIES_DEWPIDER]	 = {{EVO_LEVEL, 22, SPECIES_ARAQUANID}},

src/data/pokemon/level_up_learnset_pointers.h

@@ -905,4 +905,6 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] =
     [SPECIES_MINIOR_CORE] = sMiniorLevelUpLearnset,
     [SPECIES_WISHIWASHI_SCHOOL] = sWishiwashiLevelUpLearnset,
     [SPECIES_MIMIKYU_BUSTED] = sMimikyuLevelUpLearnset,
+    [SPECIES_LYCANROC_MIDNIGHT] = sLycanrocMidnightLevelUpLearnset,
+    [SPECIES_LYCANROC_DUSK] = sLycanrocDuskLevelUpLearnset,
 };

src/data/pokemon/level_up_learnsets.h

@@ -7721,3 +7721,13 @@ static const struct LevelUpMove sAlolanMarowakLevelUpLearnset[] = {
     LEVEL_UP_MOVE( 1, MOVE_TACKLE),
     LEVEL_UP_END
 };
+
+static const struct LevelUpMove sLycanrocMidnightLevelUpLearnset[] = {
+    LEVEL_UP_MOVE( 1, MOVE_TACKLE),
+    LEVEL_UP_END
+};
+
+static const struct LevelUpMove sLycanrocDuskLevelUpLearnset[] = {
+    LEVEL_UP_MOVE( 1, MOVE_TACKLE),
+    LEVEL_UP_END
+};

src/data/pokemon_graphics/back_pic_coordinates.h

@@ -4594,4 +4594,14 @@ const struct MonCoords gMonBackPicCoords[] =
         .size = 0x77,
         .y_offset = 0xF
     },
+    [SPECIES_LYCANROC_MIDNIGHT] =
+    {
+        .size = 0x77,
+        .y_offset = 0x7
+    },
+    [SPECIES_LYCANROC_DUSK] =
+    {
+        .size = 0x77,
+        .y_offset = 0x7
+    },
 };

src/data/pokemon_graphics/back_pic_table.h

@@ -906,6 +906,8 @@ const struct CompressedSpriteSheet gMonBackPicTable[] =
     SPECIES_SPRITE(KYUREM_BLACK, gMonBackPic_KyuremBlack),
     SPECIES_SPRITE(KYUREM_WHITE, gMonBackPic_KyuremWhite),
     SPECIES_SPRITE(MIMIKYU_BUSTED, gMonBackPic_MimikyuBusted),
+    SPECIES_SPRITE(LYCANROC_MIDNIGHT, gMonBackPic_LycanrocMidnight),
+    SPECIES_SPRITE(LYCANROC_DUSK, gMonBackPic_LycanrocDusk),
 
     SPECIES_SPRITE(UNOWN_A, gMonBackPic_UnownA),
     SPECIES_SPRITE(UNOWN_B, gMonBackPic_UnownB),

src/data/pokemon_graphics/front_pic_anims.h

@@ -8392,6 +8392,18 @@ static const union AnimCmd sAnim_MIMIKYU_BUSTED_1[] =
     ANIMCMD_END,
 };
 
+static const union AnimCmd sAnim_LYCANROC_MIDNIGHT_1[] =
+{
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sAnim_LYCANROC_DUSK_1[] =
+{
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_END,
+};
+
 static const union AnimCmd *const sAnims_NONE[] ={
     sAnim_GeneralFrame0,
     sAnim_NONE_1,
@@ -13082,6 +13094,16 @@ static const union AnimCmd *const sAnims_MIMIKYU_BUSTED[] ={
     sAnim_MIMIKYU_BUSTED_1,
 };
 
+static const union AnimCmd *const sAnims_LYCANROC_MIDNIGHT[] ={
+    sAnim_GeneralFrame0,
+    sAnim_LYCANROC_MIDNIGHT_1,
+};
+
+static const union AnimCmd *const sAnims_LYCANROC_DUSK[] ={
+    sAnim_GeneralFrame0,
+    sAnim_LYCANROC_DUSK_1,
+};
+
 #define ANIM_CMD(name)             [SPECIES_##name] = sAnims_##name
 #define ANIM_CMD_FULL(name, anims) [SPECIES_##name] = anims
 
@@ -13990,5 +14012,7 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[] =
     ANIM_CMD(KYUREM_BLACK),
     ANIM_CMD(KYUREM_WHITE),
     ANIM_CMD(MIMIKYU_BUSTED),
+    ANIM_CMD(LYCANROC_MIDNIGHT),
+    ANIM_CMD(LYCANROC_DUSK),
 };
 

src/data/pokemon_graphics/front_pic_coordinates.h

@@ -4594,4 +4594,14 @@ const struct MonCoords gMonFrontPicCoords[] =
         .size = 0x45,
         .y_offset = 0x0C,
     },
+    [SPECIES_LYCANROC_MIDNIGHT] =
+    {
+        .size = 0x45,
+        .y_offset = 0x00,
+    },
+    [SPECIES_LYCANROC_DUSK] =
+    {
+        .size = 0x45,
+        .y_offset = 0x00,
+    },
 };

src/data/pokemon_graphics/front_pic_table.h

@@ -906,6 +906,8 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] =
     SPECIES_SPRITE(KYUREM_BLACK, gMonFrontPic_KyuremBlack),
     SPECIES_SPRITE(KYUREM_WHITE, gMonFrontPic_KyuremWhite),
     SPECIES_SPRITE(MIMIKYU_BUSTED, gMonFrontPic_MimikyuBusted),
+    SPECIES_SPRITE(LYCANROC_MIDNIGHT, gMonFrontPic_LycanrocMidnight),
+    SPECIES_SPRITE(LYCANROC_DUSK, gMonFrontPic_LycanrocDusk),
 
     SPECIES_SPRITE(UNOWN_A, gMonFrontPic_UnownA),
     SPECIES_SPRITE(UNOWN_B, gMonFrontPic_UnownB),

src/data/pokemon_graphics/palette_table.h

@@ -906,6 +906,8 @@ const struct CompressedSpritePalette gMonPaletteTable[] =
     SPECIES_PAL(KYUREM_BLACK, gMonPalette_KyuremBlack),
     SPECIES_PAL(KYUREM_WHITE, gMonPalette_KyuremWhite),
     SPECIES_PAL(MIMIKYU_BUSTED, gMonPalette_MimikyuBusted),
+    SPECIES_PAL(LYCANROC_MIDNIGHT, gMonPalette_LycanrocMidnight),
+    SPECIES_PAL(LYCANROC_DUSK, gMonPalette_LycanrocDusk),
 
     SPECIES_PAL(UNOWN_A, gMonPalette_Unown),
     SPECIES_PAL(UNOWN_B, gMonPalette_Unown),

src/data/pokemon_graphics/shiny_palette_table.h

@@ -906,6 +906,8 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] =
     SPECIES_SHINY_PAL(KYUREM_BLACK, gMonShinyPalette_KyuremBlack),
     SPECIES_SHINY_PAL(KYUREM_WHITE, gMonShinyPalette_KyuremWhite),
     SPECIES_SHINY_PAL(MIMIKYU_BUSTED, gMonShinyPalette_MimikyuBusted),
+    SPECIES_SHINY_PAL(LYCANROC_MIDNIGHT, gMonShinyPalette_LycanrocMidnight),
+    SPECIES_SHINY_PAL(LYCANROC_DUSK, gMonShinyPalette_LycanrocDusk),
 
     SPECIES_SHINY_PAL(UNOWN_A, gMonShinyPalette_Unown),
     SPECIES_SHINY_PAL(UNOWN_B, gMonShinyPalette_Unown),

src/data/text/species_names.h

@@ -904,4 +904,6 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = {
     [SPECIES_MINIOR_CORE] = _("Minior"),
     [SPECIES_WISHIWASHI_SCHOOL] = _("Wishiwashi"),
     [SPECIES_MIMIKYU_BUSTED] = _("Mimikyu"),
+    [SPECIES_LYCANROC_MIDNIGHT] = _("Lycanroc"),
+    [SPECIES_LYCANROC_DUSK] = _("Lycanroc"),
 };

src/pokemon.c

@@ -1087,6 +1087,8 @@ const u16 gSpeciesToNationalPokedexNum[NUM_SPECIES] = // Assigns all species to
 	SPECIES_TO_NATIONAL(RIBOMBEE),
 	SPECIES_TO_NATIONAL(ROCKRUFF),
 	SPECIES_TO_NATIONAL(LYCANROC),
+	[SPECIES_LYCANROC_MIDNIGHT - 1] = NATIONAL_DEX_LYCANROC,
+	[SPECIES_LYCANROC_DUSK - 1] = NATIONAL_DEX_LYCANROC,
 	SPECIES_TO_NATIONAL(WISHIWASHI),
 	SPECIES_TO_NATIONAL(MAREANIE),
 	SPECIES_TO_NATIONAL(TOXAPEX),

src/pokemon_icon.c

@@ -928,6 +928,8 @@ const u8 *const gMonIconTable[] =
     [SPECIES_KYUREM_BLACK] = gMonIcon_KyuremBlack,
     [SPECIES_KYUREM_WHITE] = gMonIcon_KyuremWhite,
     [SPECIES_MIMIKYU_BUSTED] = gMonIcon_MimikyuBusted,
+    [SPECIES_LYCANROC_MIDNIGHT] = gMonIcon_LycanrocMidnight,
+    [SPECIES_LYCANROC_DUSK] = gMonIcon_LycanrocDusk,
     [SPECIES_UNOWN_A] = gMonIcon_UnownA,
     [SPECIES_UNOWN_B] = gMonIcon_UnownB,
     [SPECIES_UNOWN_C] = gMonIcon_UnownC,
@@ -1862,6 +1864,8 @@ const u8 gMonIconPaletteIndices[] =
     [SPECIES_KYUREM_BLACK] = 0,
     [SPECIES_KYUREM_WHITE] = 0,
     [SPECIES_MIMIKYU_BUSTED] = 1,
+    [SPECIES_LYCANROC_MIDNIGHT] = 0,
+    [SPECIES_LYCANROC_DUSK] = 0,
     [SPECIES_UNOWN_A ... SPECIES_UNOWN_QMARK] = 0,
     [SPECIES_EGG] = 1,
 };