From 4b3b9b5e0ad5553a3cb7d155f64e6e54ffe2b0a9 Mon Sep 17 00:00:00 2001
From: PacFire <108960850+PacFire@users.noreply.github.com>
Date: Tue, 27 Jun 2023 01:19:33 +0300
Subject: [PATCH] Added icon for Clear Amulet (#3078)

* Update graphics.h

* Update item_icon_table.h

* Update items.h

* Add files via upload

added icon for clear amulet, shards still missing.

* Add files via upload

added clear amulet's palette

* Update graphics.h
---
 graphics/items/icon_palettes/clear_amulet.pal |  19 ++++++++++++++++++
 graphics/items/icons/clear_amulet.png         | Bin 0 -> 434 bytes
 include/graphics.h                            |   2 ++
 src/data/graphics/items.h                     |   4 ++--
 src/data/item_icon_table.h                    |   2 +-
 5 files changed, 24 insertions(+), 3 deletions(-)
 create mode 100644 graphics/items/icon_palettes/clear_amulet.pal
 create mode 100644 graphics/items/icons/clear_amulet.png

diff --git a/graphics/items/icon_palettes/clear_amulet.pal b/graphics/items/icon_palettes/clear_amulet.pal
new file mode 100644
index 0000000000..cadb9a6e06
--- /dev/null
+++ b/graphics/items/icon_palettes/clear_amulet.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 255 148
+86 46 12
+0 0 0
+231 114 114
+164 57 65
+179 83 91
+245 211 240
+234 173 227
+255 255 255
+239 218 139
+225 187 43
+127 97 27
+203 178 239
+140 200 244
+203 248 255
+150 240 255
diff --git a/graphics/items/icons/clear_amulet.png b/graphics/items/icons/clear_amulet.png
new file mode 100644
index 0000000000000000000000000000000000000000..2e11a05107ecc12fbf2a8803471c3dc3c70187b6
GIT binary patch
literal 434
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN7*@Qp`g9b87@{0fod%
zTq8<?^V3So6N^$A+<jbt#we7f7AY9(nH07zc?eX(QBvUN4wNwlvKhP@H06O5OS+@4
zBLl<6e(pbstU$g&fKP}k!~ZE^dOSeh^P-|9mX4c)qrYDM@M`Vj|NsBLzt#P4w|0G^
z^yy9Sdro{g{p0_%5C1=ArYitdGbVYvyZm3u{^=-?bIsGmF{ENnasmUBo1>yCD;tM^
zh?!X#XVV7BUfI?uQ?4om9rDxS;_-Qvz_)l}mk={^u&|5M$<B$5p3H{=%K|5eT*_!J
zm@!2nouhP#xnpnIn@IxN?Zs)FemeOgEjKjxW<7H{IG6k2BiYSjrfZ`Nxz8j{idtHn
z8M=LvQpC(hdS4e^-DR$zHz8)}!mY0+vdvI7%>KISs&u#?OYw{_ZM_&(m90Wa6ECU9
zYTon?63{pJyF>fxjfE_Q441oi3-tz=F$cew?R4FsknqY<ktNyK;NTVKo@PS^w{nw6
UmFwE!Kp!%Ay85}Sb4q9e0M9d=FaQ7m

literal 0
HcmV?d00001

diff --git a/include/graphics.h b/include/graphics.h
index 22a52265d9..59d441bdab 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -8843,6 +8843,8 @@ extern const u32 gItemIconPalette_Sapphire[];
 // GEN IX ITEMS
 extern const u32 gItemIcon_AbilityShield[];
 extern const u32 gItemIconPalette_AbilityShield[];
+extern const u32 gItemIcon_ClearAmulet[];
+extern const u32 gItemIconPalette_ClearAmulet[];
 extern const u32 gItemIcon_AuspiciousArmor[];
 extern const u32 gItemIconPalette_AuspiciousArmor[];
 extern const u32 gItemIcon_BigBambooShoot[];
diff --git a/src/data/graphics/items.h b/src/data/graphics/items.h
index 9ef79b2c92..327fab0370 100644
--- a/src/data/graphics/items.h
+++ b/src/data/graphics/items.h
@@ -1943,8 +1943,8 @@ const u32 gItemIconPalette_Sapphire[] = INCBIN_U32("graphics/items/icon_palettes
 const u32 gItemIcon_AbilityShield[] = INCBIN_U32("graphics/items/icons/ability_shield.4bpp.lz");
 const u32 gItemIconPalette_AbilityShield[] = INCBIN_U32("graphics/items/icon_palettes/ability_shield.gbapal.lz");
 
-//const u32 gItemIcon_ClearAmulet[] = INCBIN_U32("graphics/items/icons/clear_amulet.4bpp.lz");
-//const u32 gItemIconPalette_ClearAmulet[] = INCBIN_U32("graphics/items/icon_palettes/clear_amulet.gbapal.lz");
+const u32 gItemIcon_ClearAmulet[] = INCBIN_U32("graphics/items/icons/clear_amulet.4bpp.lz");
+const u32 gItemIconPalette_ClearAmulet[] = INCBIN_U32("graphics/items/icon_palettes/clear_amulet.gbapal.lz");
 
 const u32 gItemIcon_PunchingGlove[] = INCBIN_U32("graphics/items/icons/punching_glove.4bpp.lz");
 const u32 gItemIconPalette_PunchingGlove[] = INCBIN_U32("graphics/items/icon_palettes/punching_glove.gbapal.lz");
diff --git a/src/data/item_icon_table.h b/src/data/item_icon_table.h
index 05a8782812..0e8112260a 100644
--- a/src/data/item_icon_table.h
+++ b/src/data/item_icon_table.h
@@ -804,7 +804,7 @@ const u32 *const gItemIconTable[ITEMS_COUNT + 1][2] =
     [ITEM_RUBY] = {gItemIcon_Gem, gItemIconPalette_Ruby},
     [ITEM_SAPPHIRE] = {gItemIcon_Gem, gItemIconPalette_Sapphire},
     [ITEM_ABILITY_SHIELD] = {gItemIcon_AbilityShield, gItemIconPalette_AbilityShield},
-    [ITEM_CLEAR_AMULET] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // {gItemIcon_ClearAmulet, gItemIconPalette_ClearAmulet},
+    [ITEM_CLEAR_AMULET] = {gItemIcon_ClearAmulet, gItemIconPalette_ClearAmulet},
     [ITEM_PUNCHING_GLOVE] = {gItemIcon_PunchingGlove, gItemIconPalette_PunchingGlove},
     [ITEM_COVERT_CLOAK] = {gItemIcon_CovertCloak, gItemIconPalette_CovertCloak},
     [ITEM_LOADED_DICE] = {gItemIcon_LoadedDice, gItemIconPalette_LoadedDice},