From d31700d2aca4dbaffb677a0242cb0ef5025f9b8f Mon Sep 17 00:00:00 2001
From: LOuroboros <lunosouroboros@gmail.com>
Date: Sat, 23 Oct 2021 13:49:02 -0300
Subject: [PATCH] Replaced the Red and Blue Orbs' sprites

---
 graphics/items/icon_palettes/blue_orb.pal |  30 +++++++++++-----------
 graphics/items/icon_palettes/red_orb.pal  |  26 +++++++++----------
 graphics/items/icons/blue_orb.png         | Bin 0 -> 299 bytes
 graphics/items/icons/orb.png              | Bin 264 -> 0 bytes
 graphics/items/icons/red_orb.png          | Bin 0 -> 309 bytes
 include/graphics.h                        |   3 ++-
 src/data/graphics/items.h                 |   3 ++-
 src/data/item_icon_table.h                |   4 +--
 8 files changed, 34 insertions(+), 32 deletions(-)
 create mode 100644 graphics/items/icons/blue_orb.png
 delete mode 100644 graphics/items/icons/orb.png
 create mode 100644 graphics/items/icons/red_orb.png

diff --git a/graphics/items/icon_palettes/blue_orb.pal b/graphics/items/icon_palettes/blue_orb.pal
index 9f061a800..1f07de0f2 100644
--- a/graphics/items/icon_palettes/blue_orb.pal
+++ b/graphics/items/icon_palettes/blue_orb.pal
@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-180 180 180
-49 49 49
-106 115 230
-156 156 222
-74 82 197
-57 65 148
-205 205 255
-255 255 255
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
+255 126 0
+48 48 48
+136 160 248
+104 128 248
+72 104 240
+240 240 248
+168 184 248
+128 208 248
+48 72 192
+248 248 248
+224 248 248
+232 248 248
+40 40 168
+184 248 248
+80 152 248
 0 0 0
diff --git a/graphics/items/icon_palettes/red_orb.pal b/graphics/items/icon_palettes/red_orb.pal
index dfbaa5cf3..486e32e8c 100644
--- a/graphics/items/icon_palettes/red_orb.pal
+++ b/graphics/items/icon_palettes/red_orb.pal
@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-180 180 180
-49 49 49
-230 115 106
-222 156 156
-197 82 74
-148 65 57
-255 205 205
-255 255 255
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
+255 126 0
+48 48 48
+248 248 248
+248 88 112
+248 128 128
+248 40 56
+248 216 216
+216 32 56
+176 32 56
+248 136 72
+248 224 96
+144 24 64
+248 200 96
 0 0 0
 0 0 0
 0 0 0
diff --git a/graphics/items/icons/blue_orb.png b/graphics/items/icons/blue_orb.png
new file mode 100644
index 0000000000000000000000000000000000000000..14374bf1d6e92205bcca88c3d6cee29efa321740
GIT binary patch
literal 299
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;wmUKs7M+SzC{oH>NS%G}r0G|-o
z|8)!o1_m7qeq=QK@W}Y^;lqy=JAO1=_+j92;Kz?24}Sc3@#BYv22kurz>FW!i@oOp
zH8Pe2`2{mLJiCzw<jnDOaSV~ToSdK_XTZh9b>ODcv15G(^D-tFPGFzP!5eI5R@Ugz
z*|tn|=alUZOI!{crSF<v(O}u*mSt>wIyNTC;g!VHE!$M5?$|M>p-60ZO!>#g!gV{Y
z?3&Y9&{N_a<E67eMtpkF_o99|gLcP7hxgvuyXdjP4Y`SZV&c<x@pUZik&{h7SFyz*
tR_jvnvonJ3GsIKQ&9T&II9u$(z+juM^U)(I;04f~44$rjF6*2UngH}8dPM*L

literal 0
HcmV?d00001

diff --git a/graphics/items/icons/orb.png b/graphics/items/icons/orb.png
deleted file mode 100644
index 0a3e182923f726541882b0814b7fcd1f8f173935..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 264
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;wg8-ip*DYJN7#bQrE6%z%XU@?e
zuPKg}|IeQN|NlQw9xFIIr+ht7g0UpXFPOpM*^M+Hr_IyFF+^hO-1CNfhYWaFFDPA<
zWwd4JJKeX|Ncr^5g^F)hWc4##S6@51QSjdrb?sB-p?_!ox)yVK&#RfceUD8G_N#oj
ztg$60bpCyPw=Lm+c_x-QdMLOY?px02!q4`cV}mJ+lEtF;JbVmS`nj)7N#hm&EfQK=
p^Te*Y*U-lM;_eR-U3GImWZO*;mf+21{~Qc*x2LP0%Q~loCIAlEUNry!

diff --git a/graphics/items/icons/red_orb.png b/graphics/items/icons/red_orb.png
new file mode 100644
index 0000000000000000000000000000000000000000..ca132f46a0830b7d7a6e7c401b511c9b624f4f89
GIT binary patch
literal 309
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;wmUKs7M+SzC{oH>NS%G}@0G|-o
z|8)!o1_nQXAfn($L&FaZiyt>`+)%LCpkVQ%!{f(;gb5N3KTaeZ?>a3E)WTR2<QL4~
z@a#q!kh8|q#W6(Ua&p1}h8`vl8AWFmPSNC+DHDneV!8rP9ud`3o%ZIDkQB#Mk76@3
zGk(#Aq8@9j1euK~-I3a}y}1v{2!3C8CUdp5)WKDA&Mx=uJ#*(GU(oT4oQ*mrCfvt5
zXNXGeDl%_L-l&tC84`7_ti$K|s+AL0mo;1R91@FNxNx=NDTyVgtxuiaUGDHEQD-ef
z(XEAgqWv2B?OqK_ZfT!-xKFqzL)_&@bbx^I1ct^+BjNozOZkEBX7F_Nb6Mw<&;$Sj
CWOV=l

literal 0
HcmV?d00001

diff --git a/include/graphics.h b/include/graphics.h
index b38f82e2b..0aaa6d898 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -3815,8 +3815,9 @@ extern const u32 gItemIconPalette_PokeblockCase[];
 extern const u32 gItemIcon_Letter[];
 extern const u32 gItemIcon_EonTicket[];
 extern const u32 gItemIconPalette_EonTicket[];
-extern const u32 gItemIcon_Orb[];
+extern const u32 gItemIcon_RedOrb[];
 extern const u32 gItemIconPalette_RedOrb[];
+extern const u32 gItemIcon_BlueOrb[];
 extern const u32 gItemIconPalette_BlueOrb[];
 extern const u32 gItemIcon_Scanner[];
 extern const u32 gItemIconPalette_Scanner[];
diff --git a/src/data/graphics/items.h b/src/data/graphics/items.h
index c3d44debd..f34037afd 100644
--- a/src/data/graphics/items.h
+++ b/src/data/graphics/items.h
@@ -630,8 +630,9 @@ const u32 gItemIcon_EonTicket[] = INCBIN_U32("graphics/items/icons/eon_ticket.4b
 
 const u32 gItemIconPalette_EonTicket[] = INCBIN_U32("graphics/items/icon_palettes/eon_ticket.gbapal.lz");
 
-const u32 gItemIcon_Orb[] = INCBIN_U32("graphics/items/icons/orb.4bpp.lz");
+const u32 gItemIcon_RedOrb[] = INCBIN_U32("graphics/items/icons/red_orb.4bpp.lz");
 const u32 gItemIconPalette_RedOrb[] = INCBIN_U32("graphics/items/icon_palettes/red_orb.gbapal.lz");
+const u32 gItemIcon_BlueOrb[] = INCBIN_U32("graphics/items/icons/blue_orb.4bpp.lz");
 const u32 gItemIconPalette_BlueOrb[] = INCBIN_U32("graphics/items/icon_palettes/blue_orb.gbapal.lz");
 
 const u32 gItemIcon_Scanner[] = INCBIN_U32("graphics/items/icons/scanner.4bpp.lz");
diff --git a/src/data/item_icon_table.h b/src/data/item_icon_table.h
index 1002e741c..2345d143a 100644
--- a/src/data/item_icon_table.h
+++ b/src/data/item_icon_table.h
@@ -239,8 +239,8 @@ const u32 *const gItemIconTable[][2] =
     [ITEM_POKEBLOCK_CASE] = {gItemIcon_PokeblockCase, gItemIconPalette_PokeblockCase},
     [ITEM_LETTER] = {gItemIcon_Letter, gItemIconPalette_LavaCookieAndLetter},
     [ITEM_EON_TICKET] = {gItemIcon_EonTicket, gItemIconPalette_EonTicket},
-    [ITEM_RED_ORB] = {gItemIcon_Orb, gItemIconPalette_RedOrb},
-    [ITEM_BLUE_ORB] = {gItemIcon_Orb, gItemIconPalette_BlueOrb},
+    [ITEM_RED_ORB] = {gItemIcon_RedOrb, gItemIconPalette_RedOrb},
+    [ITEM_BLUE_ORB] = {gItemIcon_BlueOrb, gItemIconPalette_BlueOrb},
     [ITEM_SCANNER] = {gItemIcon_Scanner, gItemIconPalette_Scanner},
     [ITEM_GO_GOGGLES] = {gItemIcon_GoGoggles, gItemIconPalette_GoGoggles},
     [ITEM_METEORITE] = {gItemIcon_Meteorite, gItemIconPalette_Meteorite},