From cd0934a39928e13fb104a384d115e498177fa3c9 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 16 Sep 2018 10:45:22 +0200 Subject: [PATCH] Add Fairy Type icon --- graphics/types/fairy.png | Bin 0 -> 245 bytes graphics_file_rules.mk | 2 +- src/graphics.c | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) 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 fb250ad82a..95180028b6 100644 --- a/graphics_file_rules.mk +++ b/graphics_file_rules.mk @@ -21,7 +21,7 @@ PSSGFXDIR := graphics/pokemon_storage EVENTOBJGFXDIR := graphics/event_objects 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 $(MONSTILLFRONTGFXDIR)/castform_still_front_pic.4bpp: $(MONSTILLFRONTGFXDIR)/castform_normal_form_still_front_pic.4bpp \ diff --git a/src/graphics.c b/src/graphics.c index 38a79ce3c4..8409586a18 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -1485,7 +1485,7 @@ const u16 gUnknown_08DD4C4C[] = INCBIN_U16("graphics/link/link_winedge.bin.lz"); const u8 gUnknown_08DD4CF8[] = INCBIN_U8("graphics/interface/unk_change_case.4bpp.lz"); -const u16 gTilesetPalettes_General[][16] = +const u16 gTilesetPalettes_General[][16] = { INCBIN_U16("data/tilesets/primary/general/palettes/00.gbapal"), INCBIN_U16("data/tilesets/primary/general/palettes/01.gbapal"),