diff --git a/graphics/types/fairy.png b/graphics/types/fairy.png new file mode 100644 index 000000000..d8170f64f Binary files /dev/null and b/graphics/types/fairy.png differ diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk index f9ea40532..d162ccbb6 100644 --- a/graphics_file_rules.mk +++ b/graphics_file_rules.mk @@ -18,7 +18,7 @@ PSSGFXDIR := graphics/pokemon_storage OBJEVENTGFXDIR := graphics/object_events MISCGFXDIR := graphics/misc -types := normal fight flying poison ground rock bug ghost steel mystery fire water grass electric psychic ice dragon dark +types := normal fight flying poison ground rock bug ghost steel mystery fire water grass electric psychic ice dragon dark fairy contest_types := cool beauty cute smart tough diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index fce2a893c..b521d3923 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -805,6 +805,10 @@ static const union AnimCmd sSpriteAnim_TypeDark[] = { ANIMCMD_FRAME(TYPE_DARK * 8, 0, FALSE, FALSE), ANIMCMD_END }; +static const union AnimCmd sSpriteAnim_TypeFairy[] = { + ANIMCMD_FRAME(TYPE_FAIRY * 8, 0, FALSE, FALSE), + ANIMCMD_END +}; static const union AnimCmd sSpriteAnim_CategoryCool[] = { ANIMCMD_FRAME((CONTEST_CATEGORY_COOL + NUMBER_OF_MON_TYPES) * 8, 0, FALSE, FALSE), ANIMCMD_END @@ -844,6 +848,7 @@ static const union AnimCmd *const sSpriteAnimTable_MoveTypes[NUMBER_OF_MON_TYPES sSpriteAnim_TypeIce, sSpriteAnim_TypeDragon, sSpriteAnim_TypeDark, + sSpriteAnim_TypeFairy, sSpriteAnim_CategoryCool, sSpriteAnim_CategoryBeauty, sSpriteAnim_CategoryCute, @@ -887,6 +892,7 @@ static const u8 sMoveTypeToOamPaletteNum[NUMBER_OF_MON_TYPES + CONTEST_CATEGORIE [TYPE_ICE] = 14, [TYPE_DRAGON] = 15, [TYPE_DARK] = 13, + [TYPE_FAIRY] = 14, [NUMBER_OF_MON_TYPES + CONTEST_CATEGORY_COOL] = 13, [NUMBER_OF_MON_TYPES + CONTEST_CATEGORY_BEAUTY] = 14, [NUMBER_OF_MON_TYPES + CONTEST_CATEGORY_CUTE] = 14,