From 81fdfdd90ba209536acf6edcc4207d92af243290 Mon Sep 17 00:00:00 2001
From: MartyKen <73791756+MartyKen@users.noreply.github.com>
Date: Sat, 10 Feb 2024 18:08:09 +0100
Subject: [PATCH] PLA aux item sprites (#4160)

* PLA aux item sprites

* Sprite sharing
---
 graphics/items/icon_palettes/aux_evasion.pal  |  19 ++++++++++++++++++
 graphics/items/icon_palettes/aux_guard.pal    |  19 ++++++++++++++++++
 graphics/items/icon_palettes/aux_power.pal    |  19 ++++++++++++++++++
 .../items/icon_palettes/aux_powerguard.pal    |  19 ++++++++++++++++++
 graphics/items/icons/aux_bottle.png           | Bin 0 -> 342 bytes
 graphics/items/icons/aux_powerguard.png       | Bin 0 -> 344 bytes
 include/graphics.h                            |   6 ++++++
 src/data/graphics/items.h                     |   8 ++++++++
 src/data/item_icon_table.h                    |   8 ++++----
 9 files changed, 94 insertions(+), 4 deletions(-)
 create mode 100644 graphics/items/icon_palettes/aux_evasion.pal
 create mode 100644 graphics/items/icon_palettes/aux_guard.pal
 create mode 100644 graphics/items/icon_palettes/aux_power.pal
 create mode 100644 graphics/items/icon_palettes/aux_powerguard.pal
 create mode 100644 graphics/items/icons/aux_bottle.png
 create mode 100644 graphics/items/icons/aux_powerguard.png

diff --git a/graphics/items/icon_palettes/aux_evasion.pal b/graphics/items/icon_palettes/aux_evasion.pal
new file mode 100644
index 0000000000..d3413dcb3d
--- /dev/null
+++ b/graphics/items/icon_palettes/aux_evasion.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+188 2 218
+48 48 48
+82 217 219
+241 204 148
+61 166 166
+252 179 109
+207 125 36
+156 229 230
+213 238 238
+255 255 255
+255 195 114
+72 62 51
+169 133 92
+39 112 112
+0 0 0
+0 0 0
diff --git a/graphics/items/icon_palettes/aux_guard.pal b/graphics/items/icon_palettes/aux_guard.pal
new file mode 100644
index 0000000000..0e5314e3ce
--- /dev/null
+++ b/graphics/items/icon_palettes/aux_guard.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+188 2 218
+48 48 48
+106 103 192
+235 243 184
+71 86 155
+193 188 124
+147 138 83
+140 139 199
+206 204 243
+255 255 255
+189 182 163
+72 62 51
+137 125 102
+68 58 101
+0 0 0
+0 0 0
diff --git a/graphics/items/icon_palettes/aux_power.pal b/graphics/items/icon_palettes/aux_power.pal
new file mode 100644
index 0000000000..ef08de2ef2
--- /dev/null
+++ b/graphics/items/icon_palettes/aux_power.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+188 2 218
+48 48 48
+201 90 114
+241 204 148
+151 70 70
+221 180 90
+168 111 70
+233 135 170
+237 172 195
+255 255 255
+230 209 174
+72 62 51
+137 125 102
+101 51 58
+0 0 0
+0 0 0
diff --git a/graphics/items/icon_palettes/aux_powerguard.pal b/graphics/items/icon_palettes/aux_powerguard.pal
new file mode 100644
index 0000000000..0f133661ea
--- /dev/null
+++ b/graphics/items/icon_palettes/aux_powerguard.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 216 216
+60 54 48
+212 178 180
+144 68 64
+224 228 216
+136 124 96
+144 132 120
+64 84 152
+104 100 192
+232 132 168
+144 84 136
+200 88 112
+64 56 96
+208 196 184
+248 252 248
+112 76 104
diff --git a/graphics/items/icons/aux_bottle.png b/graphics/items/icons/aux_bottle.png
new file mode 100644
index 0000000000000000000000000000000000000000..6f8033a6e0b07b3410ded03d17f07c64c8ab4d7b
GIT binary patch
literal 342
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN0c7oE+lP8~z!m1BJv(
zTq8<?^V3So6N^$A+<jbt#we7f7AY9(nH07zc?eX(QBvUN4wNwlvKhP@H06O5OS+@4
zBLl<6e(pbstU$g&fKQ0)9;RCc1_mdiiaws1GTqJX?v|((`ED=USG`?x`2YX^&n~X>
zuruzgO-nVl0-40XP``NBUm(Sp<n8YAe<}N?qd-oTr;B4q#hl~>1vvvQE(HsxV_h75
z9UGOKlwS#T9N}~=kT~ijEEpwoxh3J4;Vuo$Pz|L*lLs>AXKubSn<Zh6ZMK@|L5o?t
z%iabx6@OcEb1Bo~in&&Mh0pEWnts(YUgG(?H@4dE59LhVyR}Gd&S8z}@9$hy<||c;
aN;5E|2r5XwQj-(|InC46&t;ucLK6UJdUlfl

literal 0
HcmV?d00001

diff --git a/graphics/items/icons/aux_powerguard.png b/graphics/items/icons/aux_powerguard.png
new file mode 100644
index 0000000000000000000000000000000000000000..b6973df8137b6ee2d0b833b884c1793f3a5f8f17
GIT binary patch
literal 344
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN0c7oE(xm(+=!@1{4x6
zag8Vm&QB{TPb^AhaQATm8lzB_TBKmCXHwX@<RMTAM@fO7J5a_L$Y$_r(3A&KEa{HE
zjtmSN`?>!lvI6-A0X`wF3^#7rm>FEzv}J;e!-FR`I%*Oov{X2R%*aSN@S<hKgpiIC
z5d{tw2^Ws+`0?jQflo%bLe>$WUdAMEcbET5**_fxa%wzX978JRBqu1y8E|naSX|PR
z7L-X8cV=-v5h2*QxaEOCm!_)H7Kvq^hkKGu?(MC<<fd{?&EojGySL}wVlwD^arOG<
z#5uK_Hf`FSFsF1;c<S}T7F#zq7QHn%7kP1ap{c>SneB_dpF5B<)w24%?3}|I#m~+-
gs?1la7L{gTC~jAB-u0|y1<)M~p00i_>zopr09V?7eE<Le

literal 0
HcmV?d00001

diff --git a/include/graphics.h b/include/graphics.h
index e1f674c7db..e7e884e194 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -1715,6 +1715,12 @@ extern const u32 gItemIcon_FineRemedy[];
 extern const u32 gItemIconPalette_FineRemedy[];
 extern const u32 gItemIcon_SuperbRemedy[];
 extern const u32 gItemIconPalette_SuperbRemedy[];
+extern const u32 gItemIcon_AuxBottle[];
+extern const u32 gItemIconPalette_AuxEvasion[];
+extern const u32 gItemIconPalette_AuxGuard[];
+extern const u32 gItemIconPalette_AuxPower[];
+extern const u32 gItemIcon_AuxPowerguard[];
+extern const u32 gItemIconPalette_AuxPowerguard[];
 extern const u32 gItemIcon_ChoiceDumpling[];
 extern const u32 gItemIconPalette_ChoiceDumpling[];
 extern const u32 gItemIcon_JubilifeMuffin[];
diff --git a/src/data/graphics/items.h b/src/data/graphics/items.h
index 0f67f19f3d..6506ba402e 100644
--- a/src/data/graphics/items.h
+++ b/src/data/graphics/items.h
@@ -2071,6 +2071,14 @@ const u32 gItemIconPalette_FineRemedy[] = INCBIN_U32("graphics/items/icon_palett
 const u32 gItemIcon_SuperbRemedy[] = INCBIN_U32("graphics/items/icons/superb_remedy.4bpp.lz");
 const u32 gItemIconPalette_SuperbRemedy[] = INCBIN_U32("graphics/items/icon_palettes/superb_remedy.gbapal.lz");
 
+const u32 gItemIcon_AuxBottle[] = INCBIN_U32("graphics/items/icons/aux_bottle.4bpp.lz");
+const u32 gItemIconPalette_AuxEvasion[] = INCBIN_U32("graphics/items/icon_palettes/aux_evasion.gbapal.lz");
+const u32 gItemIconPalette_AuxGuard[] = INCBIN_U32("graphics/items/icon_palettes/aux_guard.gbapal.lz");
+const u32 gItemIconPalette_AuxPower[] = INCBIN_U32("graphics/items/icon_palettes/aux_power.gbapal.lz");
+
+const u32 gItemIcon_AuxPowerguard[] = INCBIN_U32("graphics/items/icons/aux_powerguard.4bpp.lz");
+const u32 gItemIconPalette_AuxPowerguard[] = INCBIN_U32("graphics/items/icon_palettes/aux_powerguard.gbapal.lz");
+
 const u32 gItemIcon_ChoiceDumpling[] = INCBIN_U32("graphics/items/icons/choice_dumpling.4bpp.lz");
 const u32 gItemIconPalette_ChoiceDumpling[] = INCBIN_U32("graphics/items/icon_palettes/choice_dumpling.gbapal.lz");
 
diff --git a/src/data/item_icon_table.h b/src/data/item_icon_table.h
index 1de353b193..9d3caea9d9 100644
--- a/src/data/item_icon_table.h
+++ b/src/data/item_icon_table.h
@@ -865,10 +865,10 @@ const u32 *const gItemIconTable[ITEMS_COUNT + 1][2] =
     [ITEM_REMEDY] = {gItemIcon_Remedy, gItemIconPalette_Remedy},
     [ITEM_FINE_REMEDY] = {gItemIcon_FineRemedy, gItemIconPalette_FineRemedy},
     [ITEM_SUPERB_REMEDY] = {gItemIcon_SuperbRemedy, gItemIconPalette_SuperbRemedy},
-    [ITEM_AUX_EVASION] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // {gItemIcon_AuxEvasion, gItemIconPalette_AuxEvasion},
-    [ITEM_AUX_GUARD] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // {gItemIcon_AuxGuard, gItemIconPalette_AuxGuard},
-    [ITEM_AUX_POWER] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // {gItemIcon_AuxPower, gItemIconPalette_AuxPower},
-    [ITEM_AUX_POWERGUARD] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // {gItemIcon_AuxPowerguard, gItemIconPalette_AuxPowerguard},
+    [ITEM_AUX_EVASION] = {gItemIcon_AuxBottle, gItemIconPalette_AuxEvasion},
+    [ITEM_AUX_GUARD] = {gItemIcon_AuxBottle, gItemIconPalette_AuxGuard},
+    [ITEM_AUX_POWER] = {gItemIcon_AuxBottle, gItemIconPalette_AuxPower},
+    [ITEM_AUX_POWERGUARD] = {gItemIcon_AuxPowerguard, gItemIconPalette_AuxPowerguard},
     [ITEM_CHOICE_DUMPLING] = {gItemIcon_ChoiceDumpling, gItemIconPalette_ChoiceDumpling},
     [ITEM_SWAP_SNACK] = {gItemIcon_SwapSnack, gItemIconPalette_SwapSnack},
     [ITEM_TWICE_SPICED_RADISH] = {gItemIcon_TwiceSpicedRadish, gItemIconPalette_TwiceSpicedRadish},