Skip to content

Commit

Permalink
Add Fairy Feather sprite (#3520)
Browse files Browse the repository at this point in the history
  • Loading branch information
kittenchilly authored Nov 3, 2023
1 parent 53b7e4b commit 9047174
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 1 deletion.
19 changes: 19 additions & 0 deletions graphics/items/icon_palettes/fairy_feather.pal
Original file line number Diff line number Diff line change
@@ -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
Binary file added graphics/items/icons/fairy_feather.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions include/graphics.h
Original file line number Diff line number Diff line change
Expand Up @@ -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[];

Expand Down
3 changes: 3 additions & 0 deletions src/data/graphics/items.h
Original file line number Diff line number Diff line change
Expand Up @@ -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");
2 changes: 1 addition & 1 deletion src/data/item_icon_table.h
Original file line number Diff line number Diff line change
Expand Up @@ -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},
Expand Down

0 comments on commit 9047174

Please sign in to comment.