diff --git a/graphics/pokemon/arctozolt/back.png b/graphics/pokemon/arctozolt/back.png index 7f25ab7be..941f900e1 100644 Binary files a/graphics/pokemon/arctozolt/back.png and b/graphics/pokemon/arctozolt/back.png differ diff --git a/graphics/pokemon/chespin/back.png b/graphics/pokemon/chespin/back.png index 735513b1f..1cf511302 100644 Binary files a/graphics/pokemon/chespin/back.png and b/graphics/pokemon/chespin/back.png differ diff --git a/graphics/pokemon/chespin/front.png b/graphics/pokemon/chespin/front.png index efc827db9..f12f3a873 100644 Binary files a/graphics/pokemon/chespin/front.png and b/graphics/pokemon/chespin/front.png differ diff --git a/graphics/pokemon/heliolisk/back.png b/graphics/pokemon/heliolisk/back.png index a72e92337..3866779b3 100644 Binary files a/graphics/pokemon/heliolisk/back.png and b/graphics/pokemon/heliolisk/back.png differ diff --git a/graphics/pokemon/heliolisk/front.png b/graphics/pokemon/heliolisk/front.png index 555485322..abefc8764 100644 Binary files a/graphics/pokemon/heliolisk/front.png and b/graphics/pokemon/heliolisk/front.png differ diff --git a/graphics/pokemon/minior/icon.png b/graphics/pokemon/minior/icon.png index edda34a25..1ce9b5a57 100644 Binary files a/graphics/pokemon/minior/icon.png and b/graphics/pokemon/minior/icon.png differ diff --git a/graphics/pokemon/popplio/back.png b/graphics/pokemon/popplio/back.png index 84b74d67f..923ab7ef8 100644 Binary files a/graphics/pokemon/popplio/back.png and b/graphics/pokemon/popplio/back.png differ diff --git a/graphics/pokemon/popplio/front.png b/graphics/pokemon/popplio/front.png index 825e65b1b..3e66227b4 100644 Binary files a/graphics/pokemon/popplio/front.png and b/graphics/pokemon/popplio/front.png differ diff --git a/graphics/pokemon/popplio/normal.pal b/graphics/pokemon/popplio/normal.pal index 6656ef50b..d977d88f4 100644 --- a/graphics/pokemon/popplio/normal.pal +++ b/graphics/pokemon/popplio/normal.pal @@ -7,7 +7,7 @@ JASC-PAL 112 152 216 136 48 112 232 112 192 -248 200 232 +152 208 224 184 80 144 56 72 144 16 16 16 diff --git a/graphics/pokemon/shroomish/back.png b/graphics/pokemon/shroomish/back.png index 2aae86b83..2baed2a42 100644 Binary files a/graphics/pokemon/shroomish/back.png and b/graphics/pokemon/shroomish/back.png differ diff --git a/graphics/pokemon/xerneas/active/back.png b/graphics/pokemon/xerneas/active/back.png index bb1cc6b09..6632a08fa 100644 Binary files a/graphics/pokemon/xerneas/active/back.png and b/graphics/pokemon/xerneas/active/back.png differ diff --git a/include/constants/pokemon_config.h b/include/constants/pokemon_config.h index 131702a85..a14ac688a 100644 --- a/include/constants/pokemon_config.h +++ b/include/constants/pokemon_config.h @@ -1,6 +1,8 @@ #ifndef GUARD_CONSTANTS_POKEMON_CONFIG_H #define GUARD_CONSTANTS_POKEMON_CONFIG_H +#include "constants/expansion_branches.h" + #ifndef GEN_3 #define GEN_3 0 #define GEN_4 1 diff --git a/src/data/pokemon_graphics/front_pic_anims.h b/src/data/pokemon_graphics/front_pic_anims.h index 421c830df..bd25b0402 100644 --- a/src/data/pokemon_graphics/front_pic_anims.h +++ b/src/data/pokemon_graphics/front_pic_anims.h @@ -9133,6 +9133,96 @@ static const union AnimCmd sAnim_DEOXYS_SPEED_2[] = ANIMCMD_END, }; +static const union AnimCmd sAnim_PIKACHU_COSPLAY_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_PIKACHU_ROCK_STAR_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_PIKACHU_BELLE_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_PIKACHU_POP_STAR_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_PIKACHU_PH_D_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_PIKACHU_LIBRE_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_PIKACHU_ORIGINAL_CAP_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_PIKACHU_HOENN_CAP_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_PIKACHU_SINNOH_CAP_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_PIKACHU_UNOVA_CAP_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_PIKACHU_KALOS_CAP_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_PIKACHU_ALOLA_CAP_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_PIKACHU_PARTNER_CAP_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_PIKACHU_WORLD_CAP_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_PICHU_SPIKY_EARED_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + static const union AnimCmd *const sAnims_NONE[] ={ sAnim_GeneralFrame0, sAnim_NONE_1, @@ -14411,6 +14501,81 @@ static const union AnimCmd *const sAnims_DEOXYS_SPEED[] ={ sAnim_DEOXYS_SPEED_2, }; +static const union AnimCmd *const sAnims_PIKACHU_COSPLAY[] ={ + sAnim_GeneralFrame0, + sAnim_PIKACHU_COSPLAY_1, +}; + +static const union AnimCmd *const sAnims_PIKACHU_ROCK_STAR[] ={ + sAnim_GeneralFrame0, + sAnim_PIKACHU_ROCK_STAR_1, +}; + +static const union AnimCmd *const sAnims_PIKACHU_BELLE[] ={ + sAnim_GeneralFrame0, + sAnim_PIKACHU_BELLE_1, +}; + +static const union AnimCmd *const sAnims_PIKACHU_POP_STAR[] ={ + sAnim_GeneralFrame0, + sAnim_PIKACHU_POP_STAR_1, +}; + +static const union AnimCmd *const sAnims_PIKACHU_PH_D[] ={ + sAnim_GeneralFrame0, + sAnim_PIKACHU_PH_D_1, +}; + +static const union AnimCmd *const sAnims_PIKACHU_LIBRE[] ={ + sAnim_GeneralFrame0, + sAnim_PIKACHU_LIBRE_1, +}; + +static const union AnimCmd *const sAnims_PIKACHU_ORIGINAL_CAP[] ={ + sAnim_GeneralFrame0, + sAnim_PIKACHU_ORIGINAL_CAP_1, +}; + +static const union AnimCmd *const sAnims_PIKACHU_HOENN_CAP[] ={ + sAnim_GeneralFrame0, + sAnim_PIKACHU_HOENN_CAP_1, +}; + +static const union AnimCmd *const sAnims_PIKACHU_SINNOH_CAP[] ={ + sAnim_GeneralFrame0, + sAnim_PIKACHU_SINNOH_CAP_1, +}; + +static const union AnimCmd *const sAnims_PIKACHU_UNOVA_CAP[] ={ + sAnim_GeneralFrame0, + sAnim_PIKACHU_UNOVA_CAP_1, +}; + +static const union AnimCmd *const sAnims_PIKACHU_KALOS_CAP[] ={ + sAnim_GeneralFrame0, + sAnim_PIKACHU_KALOS_CAP_1, +}; + +static const union AnimCmd *const sAnims_PIKACHU_ALOLA_CAP[] ={ + sAnim_GeneralFrame0, + sAnim_PIKACHU_ALOLA_CAP_1, +}; + +static const union AnimCmd *const sAnims_PIKACHU_PARTNER_CAP[] ={ + sAnim_GeneralFrame0, + sAnim_PIKACHU_PARTNER_CAP_1, +}; + +static const union AnimCmd *const sAnims_PIKACHU_WORLD_CAP[] ={ + sAnim_GeneralFrame0, + sAnim_PIKACHU_WORLD_CAP_1, +}; + +static const union AnimCmd *const sAnims_PICHU_SPIKY_EARED[] ={ + sAnim_GeneralFrame0, + sAnim_PICHU_SPIKY_EARED_1, +}; + #define ANIM_CMD(name) [SPECIES_##name] = sAnims_##name #define ANIM_CMD_FULL(name, anims) [SPECIES_##name] = anims @@ -15402,21 +15567,21 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[] = ANIM_CMD(DARMANITAN_GALARIAN), ANIM_CMD(YAMASK_GALARIAN), ANIM_CMD(STUNFISK_GALARIAN), - ANIM_CMD_FULL(PIKACHU_COSPLAY, sAnims_PIKACHU), - ANIM_CMD_FULL(PIKACHU_ROCK_STAR, sAnims_PIKACHU), - ANIM_CMD_FULL(PIKACHU_BELLE, sAnims_PIKACHU), - ANIM_CMD_FULL(PIKACHU_POP_STAR, sAnims_PIKACHU), - ANIM_CMD_FULL(PIKACHU_PH_D, sAnims_PIKACHU), - ANIM_CMD_FULL(PIKACHU_LIBRE, sAnims_PIKACHU), - ANIM_CMD_FULL(PIKACHU_ORIGINAL_CAP, sAnims_PIKACHU), - ANIM_CMD_FULL(PIKACHU_HOENN_CAP, sAnims_PIKACHU), - ANIM_CMD_FULL(PIKACHU_SINNOH_CAP, sAnims_PIKACHU), - ANIM_CMD_FULL(PIKACHU_UNOVA_CAP, sAnims_PIKACHU), - ANIM_CMD_FULL(PIKACHU_KALOS_CAP, sAnims_PIKACHU), - ANIM_CMD_FULL(PIKACHU_ALOLA_CAP, sAnims_PIKACHU), - ANIM_CMD_FULL(PIKACHU_PARTNER_CAP, sAnims_PIKACHU), - ANIM_CMD_FULL(PIKACHU_WORLD_CAP, sAnims_PIKACHU), - ANIM_CMD_FULL(PICHU_SPIKY_EARED, sAnims_PICHU), + ANIM_CMD(PIKACHU_COSPLAY), + ANIM_CMD(PIKACHU_ROCK_STAR), + ANIM_CMD(PIKACHU_BELLE), + ANIM_CMD(PIKACHU_POP_STAR), + ANIM_CMD(PIKACHU_PH_D), + ANIM_CMD(PIKACHU_LIBRE), + ANIM_CMD(PIKACHU_ORIGINAL_CAP), + ANIM_CMD(PIKACHU_HOENN_CAP), + ANIM_CMD(PIKACHU_SINNOH_CAP), + ANIM_CMD(PIKACHU_UNOVA_CAP), + ANIM_CMD(PIKACHU_KALOS_CAP), + ANIM_CMD(PIKACHU_ALOLA_CAP), + ANIM_CMD(PIKACHU_PARTNER_CAP), + ANIM_CMD(PIKACHU_WORLD_CAP), + ANIM_CMD(PICHU_SPIKY_EARED), ANIM_CMD(UNOWN_B), ANIM_CMD(UNOWN_C), ANIM_CMD(UNOWN_D), diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c index ee6388578..2373a7376 100644 --- a/src/pokemon_icon.c +++ b/src/pokemon_icon.c @@ -2017,7 +2017,7 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_PYUKUMUKU] = 0, [SPECIES_TYPE_NULL] = 0, [SPECIES_SILVALLY] = 0, - [SPECIES_MINIOR] = 0, + [SPECIES_MINIOR] = 2, [SPECIES_KOMALA] = 2, [SPECIES_TURTONATOR] = 0, [SPECIES_TOGEDEMARU] = 2,