From c0e68f33f7e8843a47115b91a775a958cfe96165 Mon Sep 17 00:00:00 2001
From: GriffinR <griffin.g.richards@gmail.com>
Date: Sun, 15 Jan 2023 00:05:42 -0500
Subject: [PATCH] Colorize pokemon storage tiles

---
 graphics/pokemon_storage/box_bg1.pal          |  19 --------
 .../box_selection_popup_center.png            | Bin 107 -> 164 bytes
 .../box_selection_popup_sides.png             | Bin 125 -> 185 bytes
 graphics/pokemon_storage/item_info_frame.png  | Bin 170 -> 170 bytes
 graphics/pokemon_storage/menu.png             | Bin 1242 -> 1336 bytes
 graphics/pokemon_storage/party_menu.pal       |  19 ++++++++
 .../{bg.pal => scrolling_bg.pal}              |   0
 graphics/pokemon_storage/scrolling_bg.png     | Bin 168 -> 228 bytes
 ..._items.pal => scrolling_bg_move_items.pal} |   0
 src/graphics.c                                |   2 +-
 src/pokemon_storage_system.c                  |  44 +++++++++---------
 11 files changed, 43 insertions(+), 41 deletions(-)
 delete mode 100644 graphics/pokemon_storage/box_bg1.pal
 create mode 100644 graphics/pokemon_storage/party_menu.pal
 rename graphics/pokemon_storage/{bg.pal => scrolling_bg.pal} (100%)
 rename graphics/pokemon_storage/{bg_move_items.pal => scrolling_bg_move_items.pal} (100%)

diff --git a/graphics/pokemon_storage/box_bg1.pal b/graphics/pokemon_storage/box_bg1.pal
deleted file mode 100644
index 52ac12110c..0000000000
--- a/graphics/pokemon_storage/box_bg1.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-106 205 106
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
diff --git a/graphics/pokemon_storage/box_selection_popup_center.png b/graphics/pokemon_storage/box_selection_popup_center.png
index f7ab30276eca5a315639cb5f69a0ea11785d0b93..d0b90c578008b0e133f439196365bfab9c77e450 100644
GIT binary patch
delta 146
zcmc~^!Z<;)o|%DxA;LZ9Es!z@@CkAKfAs&9DQkj)qW(XN`gX7Q+p{fas~M`j82-b-
zmaP9vK-_!x?g2GTzGZd?Na=gJIEHw1CVMC|NN{Lzs4_^za5Mz6F6MF*?a`75by&&N
n<XULS=n!#GLxR<VfkEfs#t9kc4pr~~^)h(6`njxgN@xNA5}!Na

delta 88
zcmZ3&m_0!<hye(^J{@KTQbwLGjv*eM$um3|3<N?pbTK5{@MY-Hk_a_el@M}p1(TPk
ofKHb+2g4z*f5Hrlx!k5OF<iLsc6(~?#9)vqp00i_>zopr0EfLBd;kCd

diff --git a/graphics/pokemon_storage/box_selection_popup_sides.png b/graphics/pokemon_storage/box_selection_popup_sides.png
index a0140dc87b386d4acb48b15455ab0a3e616c8c6e..27b4dc10a81b396f6128c574f375af635709724b 100644
GIT binary patch
delta 151
zcmb>3$v8pMg_(hY;ZmDkKaesA@CkAKfAs&9DQkj)qW(XN`gX7Q+p{fas~M`j82-b-
zmaP9vK-_!x?g2GTzGZf2qN1>8=!O|L860P;En0f{*G5~nuKoWCJ(^~DI`uTX^L;V%
w-lpEoCoTupD99@}9o@=l>AbHk+w`|MmqN|$^DEY90nK6XboFyt=akR{076GhH2?qr

delta 106
zcmdnVSUW*7g#ic-7&j&YDHl%{#}J9Bch7HRY%t(qcI;i>XSQe|Ybx^|iIR=BZe9ET
zee`acb-7K3@vQHQnfH`B*Ppn&T4IB|(xIcfIW3d#vt*lEi!GbQxJ|hEbsorEPgg&e
IbxsLQ09pYlfdBvi

diff --git a/graphics/pokemon_storage/item_info_frame.png b/graphics/pokemon_storage/item_info_frame.png
index 743e5244145f79ad9a1dd88b66c72a5468e9a3f3..734101a55eaa17eb713911e92dffbc218396b017 100644
GIT binary patch
delta 59
icmZ3*xQcOtj^Y3R|C5rEu3kOMKm@pa@a>F=vAzJ(p$#$s

delta 59
zcmZ3*xQcOtj^UIkYl4EJ{{R1f_W%E=z3-xyoDFJT5|mX96l7pvxOeZ{k|kS!YKn_N
NB5N7AgeS)O0sx-{9YO#A

diff --git a/graphics/pokemon_storage/menu.png b/graphics/pokemon_storage/menu.png
index 204c075048b0dde47dac3136c04e3178c3bb4fd1..0a1ca913b0803e2d4dcb8f3dbfbdbeb8889ba2e3 100644
GIT binary patch
delta 1284
zcmV+f1^fEi3AhT77)}TS00009TMZxp0004VQb$4nuFf3k0001BP)t-s0001#l&o`e
zds0$bl$5OYtWu<;v;Y7Aq|NqwwAKIKl-1_{wAJ>U&F=sI|62d<ktr~LF#mvz000Dr
zNkl<ZXo1z4i*}nZ42B78J+L(Fw7I~#g}nb;PO>E5kc}baob7My*oL4F3EN6qRXeL@
zHBD1@k<1_;mG`~vSJu8Ue>#Q5;mrUJyQp>mig_r9w-*Bh4mci9r>Go=Kmo9kvvJ~%
z^oryzjQ2Y;e*%I4pq>GL^dNf`XhHEFD}&Pn+8+R4EWcynkjXT$(?<jzz)1~33{dL;
z=Gr}(A$yI3BMh!0f(-zX3x9y@t^Y7R>iBTXXOHAU(6&_G->EDEknhb6LdO8~1VCM)
zYN%jyUx4r58|w$`z)Q?nfW`qdX#g975Mc>`9yc~Z5;Fh;I84=lxaO_^&JXs|)R|2`
zeIk~JKt84e_?KR_9IXIgRl%pXN&{F3!5m<_c@Lo+Kz5HRUNYm&;+v|bk@Ktb$5Z+T
z0HP(c6hO{50MmBu0`P?Wsj9;egb71a7J_LS$8o}%TUg=W6daj&gj+OLH37iMrc9zj
zfMLMvVudYJ!`~Et9>JGsg9aKKE6km|bfFj^41u}0t870!0x)25uy|Ni_1odlkq^3q
z*q3=){0tNUz&(4uumDIPdV8y-nKC@f!|gM`o+Ufv>q(BV2Ta!|H2{Dh^4co_hQWH)
z80TV-utn3I187PC*d;Uq@Vy-Z&|H`#IHNp{G`0?)P5~HyZ(}u3W%_1JYCDV`krtFB
zz|zL&13a}7uH5x172uh@AZaQ8<<kRrjv)D+Z~@?_Hw~Urb$O_|q{fZUKR-V&R`>h;
z<KuiuD0L%N*T=89z8=@><By`pRRFG51aM7g>3cVL;MdnoztIDKl>5ne;HIlO)LEei
zGywE~azAN*4<zgxfcU2xU%PqWc7sKpDt?(V0zlVhw4VofC%|g7tzqy1;5#N%UK{HD
zJODS0HgBUKP}c+K+pg=|zVq5`x2Fdn;tXJJ9=kyZjOmU6IxJ9c^}s!l1EB5xMgUO=
zoM{2T5Nz|nT?KGA@2WgNyKxrW6#xvpXPdgS5cC0mK)-bs%mvdBHu{@+*>^1QEa=P+
zF5Ko>FxQd?RDk3{<kkULcud7_IHK<bt37Z&Uo$J=F{3RWP^Fw~RI(SW^?<sqD<>OO
z3pv+n53tKC%xm#oCW4$X(1LJV%mcFdK*j?p06F8f7GSLhAdyu8_?f$m^abg49+(UP
z089jbAoD<;`hoO94~zmpo)7@ue%$mc_rQE1q?J&6rojWFf9DQh2m!7uJg_b+9(@3q
zelic`;j{C<*aIsi9^mP30c85Q`TxJD?7v~<XD(kSQhuej-<7MSHNE&cv2r=P{g*2P
z<aV_ZsQ|g0U34UXW68NWbs7LACnia6dr8)RIeqUF0F+R8?I6>jhJRX@12CC7e*zml
zr|hk1r~q`$E^2qyPB0jZ>mlGwz4elH&L3r50cd9cZ34gzXG7515I6w)$wdGc0tt)f
z`~?6BLF+=W0U#5CB>?vMJOsUc24DLOxJ+F_!09_SbO0^8eqt6BeDbC1K=BH;@JmN4
u@roL&Yzg0KFVKE|Ec}7A_{`<&g!&5*vyE{&U#7eO0000<MNUMnLSTY5^h{F#

delta 1190
zcmV;X1X=sI3fc*f7!d>m0002YtKcC3001yhOjJdYW-x#8;fOQ<00d=8L_t(og|(Nz
zZ{s!;#}(XP;0uuLioya41VvGwi42#)LviSu!Eo20!Bz2JAZgM{Y9Y{0(jCr=H+5>)
z;I`{_OU4cw4j#lToGx?w9;qLcO#KLoKG`%W=za8keB_htI1_CSMwV%5F2Nywr}`tn
z1^>J}<}H7~Y}~#^z^mFn|MljH0CmUn^e!)t`!f@O9fCtw|5!|2oaU8({-Ff86<{R~
zOBf!=VP4{hw#k5l#LMOCfKGrTD<Y*Nh^+zdn-KC6FgF0J12pmgt-=9Al9eQ5fKuXR
zwnwil+e-~l3{=z!fx+<!jw8UHpziE)4<cZcU1on7$q+aZaIr=aWOK1b9|Y_b;L-%B
z5K2N905gX!VCZwPSzoL-WP`wo03`yib~j{QrO?QuHH2jwps(&(OI84y2DoIvmc1d=
zfI)vvumW(CIMwp3HplD62%dj7vdjKEpjw_b0G@v~`$`Vk1i+xbbk21Me`tVf2|+S0
z88m-_2_f}>Lx)2HJ?E7M+~1UGu>fc&3Qj}#4Wn`(B2h3F7MwXt6~c#^4N!(aMHo@=
z!QXN~BNic#Qs<l5`~2?j+1Xs>_4zaaE0hccnE#B)IJ?2tbgs&|nuCy0#v>|ugadGc
z3858W?t$H?wg*515rArm2M$n<2!a~Wm<fMSi=+fd<x>J65e3A<a3-PG1NgxN6jDY-
z0blIlC&EF1O;of1-7=s7BP+3I2QC`G$X+nLx=&*TcsT-S4cdV3RcE+X5a;Tj+P;{5
z=jC%fsrmh>k)78^&;9G_ogsbuc>SriM+9up0I)Hv`zUv=-e#r!{^japeWR9wAH9FZ
zPCC`rxo!ZD*MHSFYANtqfV5?k6nM<v(ydRSVJGLTWs?+aVJn0o#U{`IDY$BxoTOmu
z2Xu>s+t6149`AUf+IX4*-va>1@X8Rtdk27o?~)+}-{r~_0P2?yfHDNUy#ge1NI~8J
zFnnmXRR}d89#HV22HY~71D}R8tU`a_8n7G6LcQ2dy}%D{)%Ui}!VU_H6cEByy(Hds
z6c_+=At^wdvNTPgjg7tVu1^8^skIXCTGp??*s|tsJl+d^3XJO1+Kor`php2nUx;Y7
zz&zjypL(A4e?XrC6M!eYK0u!W`MCkW+`XZU`A<?H<!m7VfN8+l4}!oB=u>|n5b#+8
zU=t{_E69wM*i81L(05mWKm&fUE9j}pOaV?8m@1q=Yeh!e^cX6@G$R00sMf&$Vz#H%
zguihO!17|f=&pC$H8mhTG6dX>m;qo%_UGc{+vBrs`>g>84yA?Z7f5)OGyqUAREwQ7
zg<gtvB!Qy^*l{Q=>>(8*6`X&^4IpN5T(;O@=n5a*Hvm}R8GB$4@L?h`0W5AXH9!gI
zgdi}47y%E=0#G3&Dg+w<Ltq#}KcE%D5r7*ZaL%4S2dcnh2wcV@>0|-Kjb=d=coysH
zn3094>%g|kx^E%2)jF^j+zETZZ2-1czp-~i^PTixW3-huG6%dX000UA07*qoM6N<$
Eg8Jkg&j0`b

diff --git a/graphics/pokemon_storage/party_menu.pal b/graphics/pokemon_storage/party_menu.pal
new file mode 100644
index 0000000000..a827cfd457
--- /dev/null
+++ b/graphics/pokemon_storage/party_menu.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+131 172 180
+41 106 98
+82 98 115
+74 172 164
+57 139 139
+164 213 246
+115 189 98
+255 255 255
+123 189 255
+0 123 255
+41 90 164
+123 205 180
+8 74 65
+164 238 148
+65 82 90
diff --git a/graphics/pokemon_storage/bg.pal b/graphics/pokemon_storage/scrolling_bg.pal
similarity index 100%
rename from graphics/pokemon_storage/bg.pal
rename to graphics/pokemon_storage/scrolling_bg.pal
diff --git a/graphics/pokemon_storage/scrolling_bg.png b/graphics/pokemon_storage/scrolling_bg.png
index 8be861a2670f9b9107292efd1963f4ef1ef94d86..228e9ce6f75cf88f302cee87367eb3f1842892ae 100644
GIT binary patch
delta 195
zcmZ3%_=ItSqzf|x14FA`LKcuR2=EDU1=3Tdtoi@{Kaf$q_di4R|NqU+Ya}H8zkBxo
z+13B|&H}}e!R0t9^NEVWC8yliF|0Tckov^<XUp@x9ZMoI3(A8-^;bqdTW!L&BRr|G
z@qk8N%Y>8nUP$|_Vpo3q%|mjP_Pzz7GN1V8TyVS1JvVyu-V4vJSv+Vey|LFv=h#b@
mIV{(zS4v+I2%fWfMis+}6EiCVQV*^J+3o4-=d#Wzp$PzEJXA9P

delta 151
zcmV;I0BHZ@0jL3x8Gir(005Vp&x8N~0B=b|K~xx(b<fEWz%U2{K$-+s090Vne&jRx
zgy)X9L|K-Ih^(qm(ODU*$_GTKVL^hxC~kyc#$In5QnWcE{q~3^v=zQksvPnUoX|(x
z3yoW?ztHDaKM;a-*u6~B$LR!|1lD_28!F*bg0q-<0J$<{i4dIw?;ijF002ovPDHLk
FV1l9`Km-5)

diff --git a/graphics/pokemon_storage/bg_move_items.pal b/graphics/pokemon_storage/scrolling_bg_move_items.pal
similarity index 100%
rename from graphics/pokemon_storage/bg_move_items.pal
rename to graphics/pokemon_storage/scrolling_bg_move_items.pal
diff --git a/src/graphics.c b/src/graphics.c
index eff0dc6fda..e0045ba6b3 100644
--- a/src/graphics.c
+++ b/src/graphics.c
@@ -1391,7 +1391,7 @@ const u32 gKantoTrainerCardFrontLink_Tilemap[] = INCBIN_U32("graphics/trainer_ca
 // pokemon storage system
 
 const u32 gStorageSystemMenu_Gfx[] = INCBIN_U32("graphics/pokemon_storage/menu.4bpp.lz");
-const u16 gStorageSystemPartyMenu_Pal[] = INCBIN_U16("graphics/pokemon_storage/menu.gbapal"); // Only used by party menu, but generated from all menu gfx
+const u16 gStorageSystemPartyMenu_Pal[] = INCBIN_U16("graphics/pokemon_storage/party_menu.gbapal");
 const u32 gStorageSystemPartyMenu_Tilemap[] = INCBIN_U32("graphics/pokemon_storage/party_menu.bin.lz");
 
 // naming screen
diff --git a/src/pokemon_storage_system.c b/src/pokemon_storage_system.c
index 1eefc23f66..9171f089bf 100644
--- a/src/pokemon_storage_system.c
+++ b/src/pokemon_storage_system.c
@@ -945,26 +945,26 @@ static const union AffineAnimCmd *const sAffineAnims_ChooseBoxMenu[] =
 static const u8 sChooseBoxMenu_TextColors[] = {TEXT_COLOR_RED, TEXT_DYNAMIC_COLOR_6, TEXT_DYNAMIC_COLOR_5};
 static const u8 sText_OutOf30[] = _("/30");
 
-static const u16 sChooseBoxMenu_Pal[]       = INCBIN_U16("graphics/pokemon_storage/box_selection_popup.gbapal");
-static const u8 sChooseBoxMenuCenter_Gfx[]  = INCBIN_U8("graphics/pokemon_storage/box_selection_popup_center.4bpp");
-static const u8 sChooseBoxMenuSides_Gfx[]   = INCBIN_U8("graphics/pokemon_storage/box_selection_popup_sides.4bpp");
-static const u32 sScrollingBg_Gfx[]         = INCBIN_U32("graphics/pokemon_storage/scrolling_bg.4bpp.lz");
-static const u32 sScrollingBg_Tilemap[]     = INCBIN_U32("graphics/pokemon_storage/scrolling_bg.bin.lz");
-static const u16 sDisplayMenu_Pal[]         = INCBIN_U16("graphics/pokemon_storage/display_menu.gbapal"); // Unused
-static const u32 sDisplayMenu_Tilemap[]     = INCBIN_U32("graphics/pokemon_storage/display_menu.bin.lz");
-static const u16 sPkmnData_Tilemap[]        = INCBIN_U16("graphics/pokemon_storage/pkmn_data.bin");
+static const u16 sChooseBoxMenu_Pal[]        = INCBIN_U16("graphics/pokemon_storage/box_selection_popup.gbapal");
+static const u8 sChooseBoxMenuCenter_Gfx[]   = INCBIN_U8("graphics/pokemon_storage/box_selection_popup_center.4bpp");
+static const u8 sChooseBoxMenuSides_Gfx[]    = INCBIN_U8("graphics/pokemon_storage/box_selection_popup_sides.4bpp");
+static const u32 sScrollingBg_Gfx[]          = INCBIN_U32("graphics/pokemon_storage/scrolling_bg.4bpp.lz");
+static const u32 sScrollingBg_Tilemap[]      = INCBIN_U32("graphics/pokemon_storage/scrolling_bg.bin.lz");
+static const u16 sDisplayMenu_Pal[]          = INCBIN_U16("graphics/pokemon_storage/display_menu.gbapal"); // Unused
+static const u32 sDisplayMenu_Tilemap[]      = INCBIN_U32("graphics/pokemon_storage/display_menu.bin.lz");
+static const u16 sPkmnData_Tilemap[]         = INCBIN_U16("graphics/pokemon_storage/pkmn_data.bin");
 // sInterface_Pal - parts of the display frame, "PkmnData"'s normal color, Close Box
-static const u16 sInterface_Pal[]           = INCBIN_U16("graphics/pokemon_storage/interface.gbapal");
-static const u16 sPkmnDataGray_Pal[]        = INCBIN_U16("graphics/pokemon_storage/pkmn_data_gray.gbapal");
-static const u16 sBg_Pal[]                  = INCBIN_U16("graphics/pokemon_storage/bg.gbapal");
-static const u16 sBgMoveItems_Pal[]         = INCBIN_U16("graphics/pokemon_storage/bg_move_items.gbapal");
-static const u16 sCloseBoxButton_Tilemap[]  = INCBIN_U16("graphics/pokemon_storage/close_box_button.bin");
-static const u16 sPartySlotFilled_Tilemap[] = INCBIN_U16("graphics/pokemon_storage/party_slot_filled.bin");
-static const u16 sPartySlotEmpty_Tilemap[]  = INCBIN_U16("graphics/pokemon_storage/party_slot_empty.bin");
-static const u16 sWaveform_Pal[]            = INCBIN_U16("graphics/pokemon_storage/waveform.gbapal");
-static const u32 sWaveform_Gfx[]            = INCBIN_U32("graphics/pokemon_storage/waveform.4bpp");
-static const u16 sUnused_Pal[]              = INCBIN_U16("graphics/pokemon_storage/unused.gbapal");
-static const u16 sTextWindows_Pal[]         = INCBIN_U16("graphics/pokemon_storage/text_windows.gbapal");
+static const u16 sInterface_Pal[]            = INCBIN_U16("graphics/pokemon_storage/interface.gbapal");
+static const u16 sPkmnDataGray_Pal[]         = INCBIN_U16("graphics/pokemon_storage/pkmn_data_gray.gbapal");
+static const u16 sScrollingBg_Pal[]          = INCBIN_U16("graphics/pokemon_storage/scrolling_bg.gbapal");
+static const u16 sScrollingBgMoveItems_Pal[] = INCBIN_U16("graphics/pokemon_storage/scrolling_bg_move_items.gbapal");
+static const u16 sCloseBoxButton_Tilemap[]   = INCBIN_U16("graphics/pokemon_storage/close_box_button.bin");
+static const u16 sPartySlotFilled_Tilemap[]  = INCBIN_U16("graphics/pokemon_storage/party_slot_filled.bin");
+static const u16 sPartySlotEmpty_Tilemap[]   = INCBIN_U16("graphics/pokemon_storage/party_slot_empty.bin");
+static const u16 sWaveform_Pal[]             = INCBIN_U16("graphics/pokemon_storage/waveform.gbapal");
+static const u32 sWaveform_Gfx[]             = INCBIN_U32("graphics/pokemon_storage/waveform.4bpp");
+static const u16 sUnused_Pal[]               = INCBIN_U16("graphics/pokemon_storage/unused.gbapal");
+static const u16 sTextWindows_Pal[]          = INCBIN_U16("graphics/pokemon_storage/text_windows.gbapal");
 
 static const struct WindowTemplate sWindowTemplates[] =
 {
@@ -1763,6 +1763,8 @@ void ResetPokemonStorageSystem(void)
 
 static void LoadChooseBoxMenuGfx(struct ChooseBoxMenu *menu, u16 tileTag, u16 palTag, u8 subpriority, bool32 loadPal)
 {
+    // Because loadPal is always false, the below palette is never used.
+    // The Choose Box menu instead uses the palette indicated by palTag, which is always PALTAG_MISC_1 (sHandCursor_Pal)
     struct SpritePalette palette =
     {
         sChooseBoxMenu_Pal, palTag
@@ -3852,9 +3854,9 @@ static void InitPalettesAndSprites(void)
     LoadPalette(sPkmnDataGray_Pal, 0x20, sizeof(sPkmnDataGray_Pal));
     LoadPalette(sTextWindows_Pal, 0xF0, sizeof(sTextWindows_Pal));
     if (sStorage->boxOption != OPTION_MOVE_ITEMS)
-        LoadPalette(sBg_Pal, 0x30, sizeof(sBg_Pal));
+        LoadPalette(sScrollingBg_Pal, 0x30, sizeof(sScrollingBg_Pal));
     else
-        LoadPalette(sBgMoveItems_Pal, 0x30, sizeof(sBgMoveItems_Pal));
+        LoadPalette(sScrollingBgMoveItems_Pal, 0x30, sizeof(sScrollingBgMoveItems_Pal));
 
     SetGpuReg(REG_OFFSET_BG1CNT, BGCNT_PRIORITY(1) | BGCNT_CHARBASE(1) | BGCNT_16COLOR | BGCNT_SCREENBASE(30));
     CreateDisplayMonSprite();