From 90471741e9e0630456f974827884f42a9a4598ce Mon Sep 17 00:00:00 2001 From: kittenchilly Date: Fri, 3 Nov 2023 14:32:12 -0500 Subject: [PATCH] Add Fairy Feather sprite (#3520) --- .../items/icon_palettes/fairy_feather.pal | 19 ++++++++++++++++++ graphics/items/icons/fairy_feather.png | Bin 0 -> 266 bytes include/graphics.h | 3 +++ src/data/graphics/items.h | 3 +++ src/data/item_icon_table.h | 2 +- 5 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 graphics/items/icon_palettes/fairy_feather.pal create mode 100644 graphics/items/icons/fairy_feather.png diff --git a/graphics/items/icon_palettes/fairy_feather.pal b/graphics/items/icon_palettes/fairy_feather.pal new file mode 100644 index 0000000000..a20a702b74 --- /dev/null +++ b/graphics/items/icon_palettes/fairy_feather.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +11 15 16 +33 19 27 +59 38 38 +102 90 92 +200 124 124 +182 116 141 +255 124 189 +227 140 140 +253 155 155 +222 173 189 +255 175 175 +195 191 192 +252 161 206 +225 221 223 +245 245 245 diff --git a/graphics/items/icons/fairy_feather.png b/graphics/items/icons/fairy_feather.png new file mode 100644 index 0000000000000000000000000000000000000000..26446886a8423de50788413bffe233e615cce661 GIT binary patch literal 266 zcmV+l0rmcgP)Px#Fi=cXMYOcE3l9(>6B|1wCT3b($b5XZbdCRfz2l6G{hOQKt-b%RufxB<{Gra_ z-QV@~^=kN}p#T5?h)G02R49?H(MuA9APhxO5`vKCll|{jf?5KdK@a*3&lRys=YAjd znObW-_B3?t4PH4Ko;}9+9emE}Pl3rfUaKMk?~9oE#>Gbf08(zN2k1s5txT?=dw(7p z&3=bb7T1793N80OcO#ORfqDI)E2I!oYOp(g4zF|j@GySNIAHt#4)kK`3625=%}zB0 Qq5uE@07*qoM6N<$f~>}H00000 literal 0 HcmV?d00001 diff --git a/include/graphics.h b/include/graphics.h index 97fb8811f8..ba10753fa6 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -9288,6 +9288,9 @@ extern const u32 gItemIconPalette_LustrousGlobe[]; extern const u32 gItemIcon_BerserkGene[]; extern const u32 gItemIconPalette_BerserkGene[]; +extern const u32 gItemIcon_FairyFeather[]; +extern const u32 gItemIconPalette_FairyFeather[]; + extern const u32 gItemIcon_ReturnToFieldArrow[]; extern const u32 gItemIconPalette_ReturnToFieldArrow[]; diff --git a/src/data/graphics/items.h b/src/data/graphics/items.h index 60cd7d5187..2ef587d994 100644 --- a/src/data/graphics/items.h +++ b/src/data/graphics/items.h @@ -2023,3 +2023,6 @@ const u32 gItemIconPalette_LustrousGlobe[] = INCBIN_U32("graphics/items/icon_pal const u32 gItemIcon_BerserkGene[] = INCBIN_U32("graphics/items/icons/berserk_gene.4bpp.lz"); const u32 gItemIconPalette_BerserkGene[] = INCBIN_U32("graphics/items/icon_palettes/berserk_gene.gbapal.lz"); + +const u32 gItemIcon_FairyFeather[] = INCBIN_U32("graphics/items/icons/fairy_feather.4bpp.lz"); +const u32 gItemIconPalette_FairyFeather[] = INCBIN_U32("graphics/items/icon_palettes/fairy_feather.gbapal.lz"); diff --git a/src/data/item_icon_table.h b/src/data/item_icon_table.h index 30ae4ba19f..de6e92371b 100644 --- a/src/data/item_icon_table.h +++ b/src/data/item_icon_table.h @@ -844,7 +844,7 @@ const u32 *const gItemIconTable[ITEMS_COUNT + 1][2] = [ITEM_LINKING_CORD] = {gItemIcon_LinkingCord, gItemIconPalette_LinkingCord}, [ITEM_PEAT_BLOCK] = {gItemIcon_PeatBlock, gItemIconPalette_PeatBlock}, [ITEM_BERSERK_GENE] = {gItemIcon_BerserkGene, gItemIconPalette_BerserkGene}, - [ITEM_FAIRY_FEATHER] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // {gItemIcon_FairyFeather, gItemIconPalette_FairyFeather}, + [ITEM_FAIRY_FEATHER] = {gItemIcon_FairyFeather, gItemIconPalette_FairyFeather}, [ITEM_SYRUPY_APPLE] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // {gItemIcon_SyrupyApple, gItemIconPalette_SyrupyApple}, [ITEM_UNREMARKABLE_TEACUP] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // {gItemIcon_UnremarkableTeacup, gItemIconPalette_UnremarkableTeacup}, [ITEM_MASTERPIECE_TEACUP] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // {gItemIcon_MasterpieceTeacup, gItemIconPalette_MasterpieceTeacup},