From 9c34121a50b861d7547ccbbed7832785c0c38ee1 Mon Sep 17 00:00:00 2001 From: ultima-soul Date: Sat, 2 Jan 2021 14:03:46 -0800 Subject: [PATCH] Fix crash when viewing Contest Moves in Summary Screen by adding Fairy type icon. --- graphics/types/fairy.png | Bin 0 -> 245 bytes graphics_file_rules.mk | 2 +- src/pokemon_summary_screen.c | 6 ++++++ 3 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 graphics/types/fairy.png diff --git a/graphics/types/fairy.png b/graphics/types/fairy.png new file mode 100644 index 0000000000000000000000000000000000000000..d8170f64f50157808a63ba5e1f75cd84d70528e0 GIT binary patch literal 245 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Et!VDx^^%Amx6id3JuOkD)#(wTUiL5}rL4Z$) zE08{W^#7VE--@H=WKH=t=ia@m|KE982K|rf{(p4Kl%%93j!W(}@0~JbNpp4a|NsAY zm>#qR>R~Ji@(X5gcy=QV$Vv8eaSV~ToZ9cm)!@M48hdSR^tOzPW-lCAor@>--*Yf- zliJeGWhXL4!#J;T>Ng>al`1hI!OhFV9EEk(ObvY^y5fSmUE-t1C$t0BXR=1^GI;yw q5Np{Uvx$7sN%a>D*q7b^Za&#@%Yu6yUCKb~7(8A5T-G@yGywp~ZeLvh literal 0 HcmV?d00001 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 ad037a5f5..ca79cd34d 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,