From 8b17c6d36d8ddfd27366c68c076f9ed238051c16 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Wed, 31 May 2023 22:33:08 -0400 Subject: [PATCH 1/8] Colorize tm_case/hm.png --- graphics/tm_case/hm.png | Bin 99 -> 156 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/graphics/tm_case/hm.png b/graphics/tm_case/hm.png index 426e404fe0dc256ffc0ad6f408b691104d4e782f..48390d03df19eaaabd054d70106939cd08cb02b6 100644 GIT binary patch delta 138 zcmYeE!#F{*o|%Dx;qBc=K|snNz$e7@KNut>C0)IG_8AAq|GmXdPEOxj3=M^ WUM<`Qd*uajv*W~lYdwW^E@*?)54^3tY_w22bR>521!{DB?}3O gX9w2);AgFnU`ULMl;`dLAqUd!>FVdQ&MBb@008+JiU0rr From febf864bf696c76bd5165a847d9d941032313bca Mon Sep 17 00:00:00 2001 From: GriffinR Date: Thu, 1 Jun 2023 13:39:17 -0400 Subject: [PATCH 2/8] Sync trainer card graphics --- graphics/trainer_card/back.bin | Bin 300 -> 1200 bytes graphics/trainer_card/back_hoenn.bin | Bin 220 -> 0 bytes graphics/trainer_card/bg.bin | Bin 184 -> 1200 bytes graphics/trainer_card/bg_hoenn.bin | Bin 152 -> 0 bytes graphics/trainer_card/{0star.pal => blue.pal} | 0 .../{fr_2stars_pals.pal => bronze.pal} | 0 graphics/trainer_card/card.png | Bin 1467 -> 0 bytes graphics/trainer_card/card_em.png | Bin 989 -> 0 bytes graphics/trainer_card/em_badges.pal | 19 ---- .../{fr_female_bg.pal => female_bg.pal} | 0 graphics/trainer_card/fr_4stars_pals.pal | 51 ---------- graphics/trainer_card/fr_badges.pal | 19 ---- graphics/trainer_card/front.bin | Bin 440 -> 1200 bytes graphics/trainer_card/front_hoenn.bin | Bin 532 -> 0 bytes graphics/trainer_card/front_hoenn_link.bin | Bin 500 -> 0 bytes graphics/trainer_card/front_link.bin | Bin 396 -> 1200 bytes graphics/trainer_card/gold.pal | 56 ++++++++--- .../{fr_1stars_pals.pal => green.pal} | 0 graphics/trainer_card/rse/back.bin | Bin 0 -> 1200 bytes .../{em_badges.png => rse/badges.png} | Bin graphics/trainer_card/rse/bg.bin | 1 + .../{em_1stars_pals.pal => rse/bronze.pal} | 0 .../{em_2stars_pals.pal => rse/copper.pal} | 0 .../{em_female_bg.pal => rse/female_bg.pal} | 0 graphics/trainer_card/rse/front.bin | Bin 0 -> 1200 bytes graphics/trainer_card/rse/front_link.bin | Bin 0 -> 1200 bytes .../{em_4stars_pals.pal => rse/gold.pal} | 0 .../{0star_em.pal => rse/green.pal} | 0 .../{em_3stars_pals.pal => rse/silver.pal} | 0 graphics/trainer_card/rse/tiles.png | Bin 0 -> 1231 bytes .../{fr_3stars_pals.pal => silver.pal} | 0 graphics/trainer_card/star.pal | 19 ++++ .../{sticker1.pal => stickers1.pal} | 0 .../{sticker2.pal => stickers2.pal} | 0 .../{sticker3.pal => stickers3.pal} | 0 .../{sticker4.pal => stickers4.pal} | 0 graphics/trainer_card/tiles.png | Bin 0 -> 1629 bytes graphics/trainer_card/unused.pal | 19 ++++ include/graphics.h | 4 +- src/graphics.c | 8 +- src/trainer_card.c | 92 +++++++++--------- 41 files changed, 135 insertions(+), 153 deletions(-) delete mode 100644 graphics/trainer_card/back_hoenn.bin delete mode 100644 graphics/trainer_card/bg_hoenn.bin rename graphics/trainer_card/{0star.pal => blue.pal} (100%) rename graphics/trainer_card/{fr_2stars_pals.pal => bronze.pal} (100%) delete mode 100644 graphics/trainer_card/card.png delete mode 100644 graphics/trainer_card/card_em.png delete mode 100644 graphics/trainer_card/em_badges.pal rename graphics/trainer_card/{fr_female_bg.pal => female_bg.pal} (100%) delete mode 100644 graphics/trainer_card/fr_4stars_pals.pal delete mode 100644 graphics/trainer_card/fr_badges.pal delete mode 100644 graphics/trainer_card/front_hoenn.bin delete mode 100644 graphics/trainer_card/front_hoenn_link.bin rename graphics/trainer_card/{fr_1stars_pals.pal => green.pal} (100%) create mode 100644 graphics/trainer_card/rse/back.bin rename graphics/trainer_card/{em_badges.png => rse/badges.png} (100%) create mode 100644 graphics/trainer_card/rse/bg.bin rename graphics/trainer_card/{em_1stars_pals.pal => rse/bronze.pal} (100%) rename graphics/trainer_card/{em_2stars_pals.pal => rse/copper.pal} (100%) rename graphics/trainer_card/{em_female_bg.pal => rse/female_bg.pal} (100%) create mode 100644 graphics/trainer_card/rse/front.bin create mode 100644 graphics/trainer_card/rse/front_link.bin rename graphics/trainer_card/{em_4stars_pals.pal => rse/gold.pal} (100%) rename graphics/trainer_card/{0star_em.pal => rse/green.pal} (100%) rename graphics/trainer_card/{em_3stars_pals.pal => rse/silver.pal} (100%) create mode 100644 graphics/trainer_card/rse/tiles.png rename graphics/trainer_card/{fr_3stars_pals.pal => silver.pal} (100%) create mode 100644 graphics/trainer_card/star.pal rename graphics/trainer_card/{sticker1.pal => stickers1.pal} (100%) rename graphics/trainer_card/{sticker2.pal => stickers2.pal} (100%) rename graphics/trainer_card/{sticker3.pal => stickers3.pal} (100%) rename graphics/trainer_card/{sticker4.pal => stickers4.pal} (100%) create mode 100644 graphics/trainer_card/tiles.png create mode 100644 graphics/trainer_card/unused.pal diff --git a/graphics/trainer_card/back.bin b/graphics/trainer_card/back.bin index dd54ba1c7ed95002be611ea1799abd87257d5bb0..14840e5e469c2f14a661593a57ee7d878dc9a1f4 100644 GIT binary patch literal 1200 zcmd^;xekI*5JgXLidWF^3H%|DC_*$L2(mTqviz(FVr2oZH7Aoh&B<+Mz+k0;Az-m) zqrqA%u}L{gG~8rFM?*_1jm*t%a4qF1SMAud Tmz~T_*K|zF1VgPfFnaR^6lN2U literal 300 zcmYk2Jx;?w5QV?BN7^l1*c}oSPDM+Lw(${i1diYY1(PU|tdIanq=+ zM_A~ng6&N~Gc)gfZ#2@xZ-Rz^&?%=r6oEiOkNnIVJxN5jm~!d$-c(x7qHef_JMMYl zG31G7u1>;SEst!$xsMjh)Q-9EV*H-jYd^N_i&NYBnk#C@*KO7QNmo>fhBao}e*bZjXoc?q=))Tr>Y)e=$W6u0QW)-T*f~-u7k_{`uHEUTl;5F8p)Fvi3 b9n6psBN^tql}?mLhe;%-X7`jV;28J=H%(;h diff --git a/graphics/trainer_card/back_hoenn.bin b/graphics/trainer_card/back_hoenn.bin deleted file mode 100644 index eda105eb2df1efcbb9bae7faebb929bb4fea3a9c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 220 zcmX|*u?@mN3`M_#ixd%p4KhMH?sP(80R(Lz3oyYcBuI?H2sc6+=AfXVbV(P^7of5H z-v5%l2#gtEQRG5G*Fcs5gT~;fVxWc%afTX)*tiP?syQp&N$9C@<$7GSc^jxNU56d$ zm6*DX+hRRVuy^9)=EWzGAfeExR$ITR;+swK{YRg%nddFe(ZuWRl1;&@ynxU{f3vWf H2vvj+zsXmc diff --git a/graphics/trainer_card/bg.bin b/graphics/trainer_card/bg.bin index c1c4522623c2dc5c8844dd48648a87c728190959..c0914427dbfb0a3c4223e623434727c433eb3eaf 100644 GIT binary patch literal 1200 VcmWd-7zLvtFd71*Auu#T008`PO921? literal 184 zcmWgGz`|fJAn<_^0skYI5Egv|e!#3PU}Rum_+S6OzQ-^s-G=4ARSMfBZ?{yDYM?M2 F001~JP+R~2 diff --git a/graphics/trainer_card/bg_hoenn.bin b/graphics/trainer_card/bg_hoenn.bin deleted file mode 100644 index b3994f663af77069a9dc0dabd9922eb3e3959143..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 152 hcmWgGz`|fJB=CU|0skYI5Egv|e!#3PU}Rum00449N2&k- diff --git a/graphics/trainer_card/0star.pal b/graphics/trainer_card/blue.pal similarity index 100% rename from graphics/trainer_card/0star.pal rename to graphics/trainer_card/blue.pal diff --git a/graphics/trainer_card/fr_2stars_pals.pal b/graphics/trainer_card/bronze.pal similarity index 100% rename from graphics/trainer_card/fr_2stars_pals.pal rename to graphics/trainer_card/bronze.pal diff --git a/graphics/trainer_card/card.png b/graphics/trainer_card/card.png deleted file mode 100644 index 2fea60d09bc33f50d0b67f27f8287ea270d00a0b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1467 zcmV;s1w{IZP) zNklc!=;+G%3_xQu^^~f@^9$P`? z>Sa-stHPSrdgsdDx-#>{zEa1o(;th)7gv9))Nfuu4R=~8Q#uR$uGDvzr8T`H0S$qQ z0PU>;7nwC95E1yPA4ahI{{+r2A;GKMm=WMQoahN^qTmUj#C>uoyLv{0I0B{A&=p7U zfvk5+29Z4fU`*CALLC9MZ7=^R3Xt^HWYp(X&O^yM%=-ZIA6g$!o4$Cbbs%t+RRULK zWfcJnP`NC(Iwr_}s04hymS6~iclsh@0`@`fMv`@`1y4X3Xhbv!v_=UCE(C$ABa8uo zwgsbm0w*8|T$qAP459#nZ8L!saCMmnhyeUx1bF>75}=Ou9rg4CTM(3XIdkqe68uH~ zkM<$H&1=CD5P}q_BY+bjfOadOZ5~*HvXua90RjpWPYJSC0=x$ToQ)v(xf20dtq26a|&* z0wSi#6AZ%shT!XalXKZ6te=835pe% zIUfX37;r2`V(|JYOly1qkK5<{D0WG!fJ-^&dGCH>r&%CyGr6fJP#pUWp7)|Z9Su@I z=7A*WyVwu#9EkC=tWzes6}T}^IX(`j_O;M=v4@bz%44*(E@vL{w?mHBkS=% zZ$$dr$@5!`oCuuQ1bC>{A5Wg0kqA7O+p>HvH9n~3GVzVf|6{R4Q-STae8vaWbm{lR z2jPNKmz6Ny2Hcha0&NAJQ-T11c_velM^p?!$ryCglLVUp!1A1?0;L-~Az&B0&%};& zVgz_QFak*!-GDH0qlQH zfc(&ui9CLd0Iz-C4$@Q($4>=X*8=Z}T?K9$2vnm$>vGQXTVpF8f}Uqpo9!errF7H4 z(_A#&bwmg}#%-A}yw9b;Peme7#BCC}UO%+S~}>Ue#MgUtUG^eTKVY zAOOTzz+>0gRYdRzFGm88)!8slgm71s0%jwy0yccEjr$vcTVc2>3W2$g_3FGrl44Q}90ccd_h5 zP)$J+6o^8a2Z=!CMDGKi2Rh9IC$QJVTBs)&x0qN9^-eBrIG|9^>L VLWzQB#S#Dj002ovPDHLkV1j^0q>umr diff --git a/graphics/trainer_card/card_em.png b/graphics/trainer_card/card_em.png deleted file mode 100644 index bd8be5162536bd76690219ec59a712e75c20c831..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 989 zcmV<310wv1P)V!Zn9;Bc000AM zNklyKdVs6o$2A4zzOAmU^kZ_* z0--l3GI|l%b9gN_)D$n!fvIOCI84)~`ztzv^c1e$Vf}93U!vI4DKP|9n_hY2e``!fWemH4+B!ca4+E=KEKGE5^CXAhi)Q( zO#%wo7)Aj1@cDV_HC6w-y$G1rvb;Ab8_hSXbK8X@It1I}vu~ z0jkOZLJI;E8%ArvoG(G|K`$V@QM)`Sf>N6Pp_1YM0&x(Ac7U*CgA@x>g|VX2(xbPw z!)OjV0NhHZN(V4=iDW{d7A(L-fW@;wQn?qvNE8(COaQ$W?Av_{H}qSG0)j#TYYK>2 z2#1SWpu?G*dhkphFfXyPKqgFY1X8aLDyleukx}sSK;?i1L@kgJ@biFqQ(jLWs5iUX z0O*|gl%BQ#dl-SUP&o@fNFI2A{U(d%!OQ`?Jn$^+H{oTM2h0s~JP!bXYXmCMq7SI* zr%Z{cgzo+RTM=XFGJ11-HC!?T}hPIZ~ZOsz%Cdd<|taN&(>Gha};n z^u@DqEyOfHB3=Oi|EYfyf^*U0VFSO75H0MSH}-lf4>|wpTX;nP7rbe46Y@}Sgusz( ztFFsycr^r|3;=&6pv4Ft6@aU|3M#r5ECAvY7_@v^MIc%YP=3w;T70F70NhGIb5s`O z-R20_kG&R->gBEzxp?Hti?jg!{1^jF7{)&Wn3T$>Ngoqx>gW6$^?1x}ciO&Y00000 LNkvXXu0mjfIo-3# diff --git a/graphics/trainer_card/em_badges.pal b/graphics/trainer_card/em_badges.pal deleted file mode 100644 index dd9246d9d..000000000 --- a/graphics/trainer_card/em_badges.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -139 98 115 -255 255 255 -213 213 213 -180 180 180 -123 123 123 -255 139 57 -222 57 8 -106 189 255 -65 139 197 -255 213 98 -238 180 57 -197 123 197 -148 74 156 -106 189 255 -205 205 205 -0 0 0 diff --git a/graphics/trainer_card/fr_female_bg.pal b/graphics/trainer_card/female_bg.pal similarity index 100% rename from graphics/trainer_card/fr_female_bg.pal rename to graphics/trainer_card/female_bg.pal diff --git a/graphics/trainer_card/fr_4stars_pals.pal b/graphics/trainer_card/fr_4stars_pals.pal deleted file mode 100644 index 79027f0d8..000000000 --- a/graphics/trainer_card/fr_4stars_pals.pal +++ /dev/null @@ -1,51 +0,0 @@ -JASC-PAL -0100 -48 -139 98 115 -255 246 230 -246 238 213 -246 246 197 -246 238 180 -246 222 106 -164 164 164 -98 98 115 -255 255 148 -246 222 49 -246 205 8 -238 189 0 -189 148 57 -255 255 197 -255 255 255 -246 230 82 -139 98 115 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -189 148 16 -255 213 82 -82 205 180 -65 172 164 -197 197 197 -90 90 90 -0 0 0 -32 65 123 -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/trainer_card/fr_badges.pal b/graphics/trainer_card/fr_badges.pal deleted file mode 100644 index dd9246d9d..000000000 --- a/graphics/trainer_card/fr_badges.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -139 98 115 -255 255 255 -213 213 213 -180 180 180 -123 123 123 -255 139 57 -222 57 8 -106 189 255 -65 139 197 -255 213 98 -238 180 57 -197 123 197 -148 74 156 -106 189 255 -205 205 205 -0 0 0 diff --git a/graphics/trainer_card/front.bin b/graphics/trainer_card/front.bin index b83c4394298b0fa0e0b5f55e6bb3d4f142b9dbba..c83a6e494a34b961b6cc802e6ef2c3e9817785b2 100644 GIT binary patch literal 1200 zcmbW$*G|G<9ES1d;44-wcv3V`6M__tXyS@{?=9}VZl$GS68D>wb4t$u;(EdB7p3 zp6}i%dvD7J9y!ih_q%V(zT5W0mX7uE4>_Ot%vy^G+w8E*9#>p*!z~RSipX~%NXRZh yLgcf-jMYPS3B8E)mdh=cTOqejt|7NlZoR!h!xE;RqQpljVH%+6f&4Qx1Mv&|cWdha literal 440 zcmXAm%T7~K7=^z-*;^0xR3SN)1Z&u}MFJ(EYOo$R>aL<7a#!wNs_|~s8V3yV5qt!^ zPpd|q@(9Mn`FVsr@BwT&(=S<<7(0FJ5*9tso*t^Kc4sDpHgf;0!UG#WK!0 zIL`&vSVwKJ$#El}sC`c43j?ZTEK^)%nrkq_EOX2wk9opVo;e%+;AbMgj4hB4=t@HZ zRV!eRwVM>%CA=7^aDtNrr+7%k78y#s>`0|L#%ZeK+&9v+9jT*HbJe%D*AFFfk;bJr zanla^av~GB%WmunlPvIR(QkE3m$>fY-Wx2No{uS+SaI?vsmLI)tLAtzOh>)!IG*+gC1W>jXv#DbC9}Anp{Wve4uy&TJ~q zvgy*8n3R9ef8b9baplgZzd#z}?&K`Kb8=3!CFz19S_L8yeoGW3c;r0_9iuJs(nE%b zvm||Z#A6nD0#A9yb6&tpUa^E+L~LanyG>6+MB_4K?22r_YnFM#TX@HNKJXFwiO;N< z)P4pJFdA56`#AXXUsRv5{iMJ!#7;zey^jbJAtKXZ>Gt(k>|tEZA%=roO(d8|*1jcW zf^yZ0F=Bx*qG~gYWFbdRW~DS_e4C=ekq}2Y#_{&eUCm1OIJQKYa$1(K2`1WZokB^KRav_wO})dp1@qkI z4tI&&lfh?bru+N zu|aWWO+{2>REH_duf;jN0lHE2u#tt{9}feu{5{$`AP4>gPTrq!E_v-zuW292}D oID3q<_lt4T#@Sb~p2~ab|Et=Y)Uu#7o#|WRL6Krd1;Q170RvQVWB>pF diff --git a/graphics/trainer_card/front_hoenn_link.bin b/graphics/trainer_card/front_hoenn_link.bin deleted file mode 100644 index 46e00f6702e81e7bad661295ffbd90cf8479dd56..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 500 zcmXAlOHUI~0ENF>Zo)O*zCsrUTOHIUL~CaRr88X8sV@*hNb$X_DAt|gYh1V(#W$P! zez2K8U{e0U`~$b{*t%o<1=R!-+8?11XTZ&a~hvq!9u@lf}Dqs29X=;L$a}UT;Zy-6JqMhR<^E3m|7Ifae?j-cR0YozpKUWgsNCuV_jX2f@^S{fG12ln8aJ& zR(X|obdJW_b_pr}rB_8_Eh`smT8!mv@{3$kVPYeNVe;sz>HdH;>ie4o- z#E-v3Q6NrzgyI5{q-c&%N+g9xh5-f{Vwe#|8DpFS4mskOHoq5MYkDIiJl`&`$P&w} zu*w?iTyw)MciMjQQ`4_+T^t%CNH1(Q{(+9_{m16i$e eLfM2N^E;>4PaX%m79rytBAWbTLc-BPgSc z!DGf*WexL&w{-h*Lg6%&Z*-Zgue{(Tub6^qW|(CT*&(GZ7t zrqF?QR-0t1C7k$@;}QLM1AHK-8G1t}N0Q4AGDLoq4PVL{NiBN?oByOOt~Zn?>`iu;nX*iyZ|0+^t^y0Fc%2oq-A6> zdZV-svbE<+&mQ{5-iQBe zXGfL}q#D8fB~Ru_<}>qTccF-qji)G}K%T)Sk{1OLB*v~-W1S5)*YPb?T%@Xz$wq=MITKNm|PcS+XJ{1Zm5rxW|2l7-ppI z?)FMw($>Mn6^^zg%jTG3ni*!9tFyN&{iK|fW$C@+veIkyZ{`$BEVIHx9`TqbmLFxz zbS3Q^=}K2QO5bbQ9M5^dDld7(Yu;FPo(0pTwav(^%&LsGY0IVA$G} z37Iq#ds8P>!m>FQdB9uVafiGAwcaUV8Ichc*3QepH;U=APH`GZ3uid1yW_Vl~kO}%7lr>R}0cAMIxt7i)`F9(}QUKJD+rK0f^wLHo57b6Bpt^fc4 literal 0 HcmV?d00001 diff --git a/graphics/trainer_card/rse/front_link.bin b/graphics/trainer_card/rse/front_link.bin new file mode 100644 index 0000000000000000000000000000000000000000..af5e6259efb9b6fb3abe21e4a8cdacc9bf07a37d GIT binary patch literal 1200 zcmbu-$4>%56vy!|W)5>0AqGwgb}ouw13?McTZpmi(XL0k9_@{bz5cV#F08IZNx=DC z<|Xsl_cF5(L&?Gu6A&drM-hpLs3^fhS{!lA38$QK&IOlTam@{BgibjX)SEk_vf>dX zru`7N+;PtXk38|r3$MKK&WCxjfkxWD%uicNQxPdO`?~Q{O%1g;^2Uh^mvD;ADR86KX`smN;U6-xn+9pVn6bWtP zHXCM~2_~6hI>)wU>y%8%F=^cKn9_UoJ+q$$7FlAM6;@fZ`2hyaDz05ZCS_73l!uudrO%w$nA)ejHXCM+ zc@8+FldfN_@fD|ZNtbeJXC(7R9z@{_>whksisG%lFQac%j>yp>GNPgiVp36fVp{%Z FeFDp?Nap|m literal 0 HcmV?d00001 diff --git a/graphics/trainer_card/em_4stars_pals.pal b/graphics/trainer_card/rse/gold.pal similarity index 100% rename from graphics/trainer_card/em_4stars_pals.pal rename to graphics/trainer_card/rse/gold.pal diff --git a/graphics/trainer_card/0star_em.pal b/graphics/trainer_card/rse/green.pal similarity index 100% rename from graphics/trainer_card/0star_em.pal rename to graphics/trainer_card/rse/green.pal diff --git a/graphics/trainer_card/em_3stars_pals.pal b/graphics/trainer_card/rse/silver.pal similarity index 100% rename from graphics/trainer_card/em_3stars_pals.pal rename to graphics/trainer_card/rse/silver.pal diff --git a/graphics/trainer_card/rse/tiles.png b/graphics/trainer_card/rse/tiles.png new file mode 100644 index 0000000000000000000000000000000000000000..b19e0d0ed9ef90f0287771d7f3c1a8313102ad1d GIT binary patch literal 1231 zcmeAS@N?(olHy`uVBq!ia0vp^4L}^g!3-py-Rr#uq!^2X+?^QKos)S9Xt2AfbRLGD z7o@Ow=rl}7W;t?V-2*ehX|8e%$^Bvq4EGl>T$oU(%W|kIA%}6s3fqkh&eJw4L{~gW zJj`_X?k#18jjS(Ko?J*}Tyr6hd!Ogl{=_WCE%qM!J?cGb4tEqctZEI4*r+T2>;97c zDttFR7IHD~n6N(f_|vKl3w|s#&XhYKoXYV3wcFRHdT@}+r<^LVY84tzda|2Rob;JZ4*SFs1?-x+?|EI7lOe{iCu!v2k6?hL7XYmMAa zGFNin*(kzzmMJqa!|fTsg`QyYaK_~n6+P{g>Ki*U_7+97u&q-r!k=b6N z`0wNEpC$}nYRnHriamJz^P^<||AVO6(F$^hHTXBEE@!Oq-Dn|OPN=@+q}<*QyG#u7ffZfec64gpLxTNKgV@{SR4qETCtV&zy5)zVljLL zJ6Y2iKgjQ1&8WBiflh9=DZp7Z-+8S-*b=B0J>pRgJqSjM{k z-BGa*8h=j97Qg>DWxs|=fpX0qMh7Q`|2LUyesg>gJYaINdh+dVV1iO?6Lj6+umAn=JM)%HdE9!eJM=^+>(xkF d#{RYX$1bt!vVBbb>jY3X^>p=fS?83{1OQYpF`57X literal 0 HcmV?d00001 diff --git a/graphics/trainer_card/fr_3stars_pals.pal b/graphics/trainer_card/silver.pal similarity index 100% rename from graphics/trainer_card/fr_3stars_pals.pal rename to graphics/trainer_card/silver.pal diff --git a/graphics/trainer_card/star.pal b/graphics/trainer_card/star.pal new file mode 100644 index 000000000..ebd175e97 --- /dev/null +++ b/graphics/trainer_card/star.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +139 98 115 +246 197 0 +205 164 0 +246 197 0 +246 197 0 +246 197 0 +246 197 0 +246 197 0 +0 0 0 +0 0 0 +189 148 16 +255 213 82 +0 0 0 +0 0 0 +189 148 16 +246 197 0 diff --git a/graphics/trainer_card/sticker1.pal b/graphics/trainer_card/stickers1.pal similarity index 100% rename from graphics/trainer_card/sticker1.pal rename to graphics/trainer_card/stickers1.pal diff --git a/graphics/trainer_card/sticker2.pal b/graphics/trainer_card/stickers2.pal similarity index 100% rename from graphics/trainer_card/sticker2.pal rename to graphics/trainer_card/stickers2.pal diff --git a/graphics/trainer_card/sticker3.pal b/graphics/trainer_card/stickers3.pal similarity index 100% rename from graphics/trainer_card/sticker3.pal rename to graphics/trainer_card/stickers3.pal diff --git a/graphics/trainer_card/sticker4.pal b/graphics/trainer_card/stickers4.pal similarity index 100% rename from graphics/trainer_card/sticker4.pal rename to graphics/trainer_card/stickers4.pal diff --git a/graphics/trainer_card/tiles.png b/graphics/trainer_card/tiles.png new file mode 100644 index 0000000000000000000000000000000000000000..5d2b11467f5ebe70e0b4c78f90343c9d56821ffc GIT binary patch literal 1629 zcma)6e^gU-6#u@r_u>r{=Z2s-bL2Krz$lSlt-~{ZGn|76aiOk>iUm4A6BO|Q8X_ta zryx$5v6s!KKI<&`XP+D~8N8rL8=I_=)D~yZ@E|8=d&1S=Mve#&C zv$9LBQmG`8G;?pkr7rpBDuYPT<(H-)%?%_;<~A6uc@mKSg$6l|?2V4@y7Znx-qzM8 z5{dp#-YAdml`MIaH@AT<6|m~RVZGN{|LlL$TLV8XAFc!d<%b8Yj7iLHIA!;25yw-*Lew#9$pAql!+qE8flE9n#>G4~ZOI>mA=NpDVEcZi83B4SGhv|Qt^6e#0H zHFP18d6sBD;hb%^;vHf?St&&Z1+u-=?F`^K;a+@x9OCEpX?M2l_r?Y=q0UrRl zgg)d%MB;OpRkOfFOqET?E+B^U;&Eu|`ohIvIt=hmS~mj0N>DX!gQ;G$Waep%TcAa< ztOw{0y4I%X<=&FjsHz{-6SVdj_6(vHAig&r`e2<`2m$Q5&CaBzf7RGAgayrS&o(u5 zjB?>k_5<~RrzG~MTacjnAD-OFqKDn|x7B@To*G=^we#ge(syf5(!6U&DTHv5%|C`jaFF#`{z7Ef&%798`kH3o6ae!nT!bOW$F~2)K^{f5Oja=4JPZJ zS{{}gVUN&LtAc5v+P|{9`8VT#%=wZ|N z8KW@Ia()f<^x?}iAN1gTO$pGoxWAbss?*f3XrK7X!c@{1m0ROoJxTdN~~ zp}jbb>gVLCN18-qatS?>8@L45hdb3=_&&o?;)gm*2O^zP7JZCwTwfdo<=;*4laKs# zJt}wNKn1{cbfxk+qb7!$&T|=rM|s{l7tG+~439Fv99(loakKw;lFtl-(;#djOCLVh z@B4wQn{*eeM|?5|;oH+mR2h;WU^>VaExx4-RO-lziNs`B)fB;MtZn2>_;`I_8E6Vu za)@p>O~NKLhjd~bv~1TbgL{Uk31EahwJIQ#nz?u*BArfi)bVA9^&ab^m+!r?;q6St z?1Qton>oV_nu4d+keCjC+O6V@{Ms9Ol(^%Z* zAGlc%iq$t~vv@ z$s1y$@$<+~%oQ9YX3=oSnMi@Z?(<|w-658p*icDSY-9_kF0$d0Lfe7hLL~ke+}YfR zx-K!Tg*MqrZ9Jgj;@Nj0C8%=Pz|Ltwc7S9ky19}FC?Z_6{zoU8#cardType == CARD_TYPE_RSE) - LoadPalette(sHoennTrainerCardStarPals[sTrainerCardDataPtr->trainerCard.rse.stars], BG_PLTT_ID(0), 3 * PLTT_SIZE_4BPP); + LoadPalette(sHoennTrainerCardPals[sTrainerCardDataPtr->trainerCard.rse.stars], BG_PLTT_ID(0), 3 * PLTT_SIZE_4BPP); else - LoadPalette(sKantoTrainerCardStarPals[sTrainerCardDataPtr->trainerCard.rse.stars], BG_PLTT_ID(0), 3 * PLTT_SIZE_4BPP); + LoadPalette(sKantoTrainerCardPals[sTrainerCardDataPtr->trainerCard.rse.stars], BG_PLTT_ID(0), 3 * PLTT_SIZE_4BPP); break; case 3: if (sTrainerCardDataPtr->cardType == CARD_TYPE_RSE) @@ -1491,12 +1491,12 @@ static bool8 SetTrainerCardBgsAndPals(void) break; case 4: if (sTrainerCardDataPtr->cardType == CARD_TYPE_RSE && sTrainerCardDataPtr->trainerCard.rse.gender != MALE) - LoadPalette(sHoennTrainerCardFemaleBackground_Pal, BG_PLTT_ID(1), sizeof(sHoennTrainerCardFemaleBackground_Pal)); + LoadPalette(sHoennTrainerCardFemaleBg_Pal, BG_PLTT_ID(1), sizeof(sHoennTrainerCardFemaleBg_Pal)); else if (sTrainerCardDataPtr->trainerCard.rse.gender != MALE) - LoadPalette(sKantoTrainerCardFemaleBackground_Pal, BG_PLTT_ID(1), sizeof(sKantoTrainerCardFemaleBackground_Pal)); + LoadPalette(sKantoTrainerCardFemaleBg_Pal, BG_PLTT_ID(1), sizeof(sKantoTrainerCardFemaleBg_Pal)); break; case 5: - LoadPalette(sTrainerCardGold_Pal, BG_PLTT_ID(4), sizeof(sTrainerCardGold_Pal)); + LoadPalette(sTrainerCardStar_Pal, BG_PLTT_ID(4), sizeof(sTrainerCardStar_Pal)); break; case 6: SetBgTilemapBuffer(0, sTrainerCardDataPtr->cardTilemapBuffer); From fe99ef341db52d0285fd6480484e59fb8b03e9aa Mon Sep 17 00:00:00 2001 From: GriffinR Date: Thu, 1 Jun 2023 13:39:51 -0400 Subject: [PATCH 3/8] Correct colors in item_pc/bg.png --- graphics/item_pc/bg.pal | 51 ---------------------------------------- graphics/item_pc/bg.png | Bin 807 -> 923 bytes 2 files changed, 51 deletions(-) delete mode 100644 graphics/item_pc/bg.pal diff --git a/graphics/item_pc/bg.pal b/graphics/item_pc/bg.pal deleted file mode 100644 index b873bd0f6..000000000 --- a/graphics/item_pc/bg.pal +++ /dev/null @@ -1,51 +0,0 @@ -JASC-PAL -0100 -48 -0 0 0 -148 189 246 -106 172 230 -238 246 246 -222 230 230 -255 189 74 -230 131 41 -172 74 8 -156 164 172 -115 123 139 -164 255 139 -139 238 106 -115 222 82 -98 205 57 -230 230 238 -255 255 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -189 213 213 -238 255 255 -222 246 255 -255 255 255 -164 222 255 -16 172 222 -0 82 115 -0 115 139 -0 123 197 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -189 213 213 -238 255 255 -222 246 255 -255 255 255 -164 222 255 -24 82 180 -0 90 131 -24 82 180 -24 82 180 diff --git a/graphics/item_pc/bg.png b/graphics/item_pc/bg.png index 4db6a6bcbc7f4407b8eed2ff5d7aef89e2c28d91..a028e79074048381f7cf8083e3aa06e83e079406 100644 GIT binary patch delta 864 zcmZ3^Hk*BdgcJue0|P^m5u+54Vk{1FcVbv~PUa<$Ghw2tNj;Fp1beSuefR(Wy>I`4 zV9CAz0&DIu1QjzBcQaHU#Z(LwK~pagw1pw68At+=vR~^11_q{`o-U3d5v^yZ-@LR~ zL7?@vYS+aVsjL2-sz0;me>5MHZxti!-WitSfm?n*-XPtuU|GcDWQ9XD8Mh6Wcb+oo2YI$X^0V*7%eI)xO5 z+V)95KiM(gFnijt|_z1-pQ-&>ybRvnp3w3!{Q zoXB2w@S(cR+p6V!DZP8rSXP{7e#|BF;$t~q6PL^qMp3>?zAFkQygTB={`28!>ko$) zAB(@|%Dz*x>)aDd1rw*di3>KriF^6k{e*6CNdn`{y_dL)q*)6KG$dZUS+M5C0#o-U zN5Qs6YYm1Mnx|#nWF0A;_09RvjL`ag4MTe?3$~uZJu{OUes6vMvFnhcuIF31ZJt#JgLLuvM$RXv`6k3XTQHqZDq^)v4Zkm=M$v{(?^_rY8g(9pUzjgk z$Z#?DfV#$!+IuVf6&u=X>lWRc&hTFUfjh%3&9znzs|}wve5uOsVm!|H)8&qZ9`lBk z_5b-A4%afB@L%9`;5)0|!~2d)8B}9Zwlk{v)PJqN_+a+mPhXCc?CNjL8? z&pejL_RYhCvBr*7N8z7{S!_MSho3AP&TRN~H~;(%&a>Mz88)9`=q`2m&g7k8#X4ht zy-OD*92=v01)ieiH9}fyil1o261C8P8??`7d+ge1j4D zGlqh&#e$F3_FF4A_(&XYk8*8T{Z1>Pmp3PmahW$m;f4_ACl|x`1=_Ps9eT5u{$o1i W{*uq|QA#H$`FpzhxvXl*x~u_)oG@IwzrAjWE!z;zZ%f`Gpi&q)}t4Mzw7_oUvYdSsB(e*a8yPwEYTZXH4~fV#TDuEAgc zb#;RP!Ul1Rut5wmWN@bF7=HKr=l&w0K`wtQ*iOXpgB?(EW55=>K%(TcJuom87;; zhkyz`5U5l7f$DmIH6V}{ErxN?VkpCgb23B#gbcT2h{A@F-Vp#`rLKkKI+Yg!Oj>_| zwT`a)2itrT0;uliROkB<;0pj#20Gax4Zx&x6cGC#1p%+ZX@o;^6oA{l41lTofU`&; z;168hP-6(NfsJbgQoRZGKQm4BsTl7xS!TMNFBVYl7YY}85=S32egO6}0+!0`!X!F% zfZc+Cm3q9_Bl(s^6$3M)Ho&i?GN*qbyL->TTmt(w0grcVn6Y7r1^{-`A7zns37FI9 z7b^j1A|u0WM!=E{tF^gUZ=igF^+OvxSv_5 Date: Thu, 1 Jun 2023 14:09:45 -0400 Subject: [PATCH 4/8] Correct item_menu/bg.pg colors, combine list tilemaps --- graphics/item_menu/bag_pal1.pal | 51 -------------- graphics/item_menu/bagmap_0.bin | Bin 36 -> 0 bytes graphics/item_menu/bagmap_1.bin | Bin 36 -> 0 bytes graphics/item_menu/bagmap_2.bin | Bin 36 -> 0 bytes graphics/item_menu/bagmap_3.bin | Bin 36 -> 0 bytes graphics/item_menu/bagmap_4.bin | Bin 36 -> 0 bytes graphics/item_menu/bagmap_5.bin | Bin 36 -> 0 bytes graphics/item_menu/bagmap_6.bin | Bin 36 -> 0 bytes graphics/item_menu/bagmap_7.bin | Bin 36 -> 0 bytes graphics/item_menu/bagmap_8.bin | Bin 36 -> 0 bytes graphics/item_menu/bagmap_9.bin | Bin 36 -> 0 bytes graphics/item_menu/bagmap_A.bin | Bin 36 -> 0 bytes graphics/item_menu/bagmap_B.bin | Bin 36 -> 0 bytes graphics/item_menu/bg.png | Bin 539 -> 661 bytes .../item_menu/{bag_pal2.pal => bg_female.pal} | 0 graphics/item_menu/list.bin | Bin 0 -> 432 bytes src/graphics.c | 4 +- src/item_menu.c | 64 ++++++++---------- 18 files changed, 32 insertions(+), 87 deletions(-) delete mode 100644 graphics/item_menu/bag_pal1.pal delete mode 100644 graphics/item_menu/bagmap_0.bin delete mode 100644 graphics/item_menu/bagmap_1.bin delete mode 100644 graphics/item_menu/bagmap_2.bin delete mode 100644 graphics/item_menu/bagmap_3.bin delete mode 100644 graphics/item_menu/bagmap_4.bin delete mode 100644 graphics/item_menu/bagmap_5.bin delete mode 100644 graphics/item_menu/bagmap_6.bin delete mode 100644 graphics/item_menu/bagmap_7.bin delete mode 100644 graphics/item_menu/bagmap_8.bin delete mode 100644 graphics/item_menu/bagmap_9.bin delete mode 100644 graphics/item_menu/bagmap_A.bin delete mode 100644 graphics/item_menu/bagmap_B.bin rename graphics/item_menu/{bag_pal2.pal => bg_female.pal} (100%) create mode 100644 graphics/item_menu/list.bin diff --git a/graphics/item_menu/bag_pal1.pal b/graphics/item_menu/bag_pal1.pal deleted file mode 100644 index e94c83852..000000000 --- a/graphics/item_menu/bag_pal1.pal +++ /dev/null @@ -1,51 +0,0 @@ -JASC-PAL -0100 -48 -0 65 90 -255 0 255 -41 57 82 -65 180 164 -255 0 255 -255 0 255 -106 205 197 -246 205 115 -238 230 172 -255 255 205 -222 139 74 -148 148 148 -238 230 172 -106 106 106 -213 180 82 -205 65 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -189 213 213 -238 255 255 -222 246 255 -255 255 255 -164 222 255 -16 172 222 -0 82 115 -0 115 139 -0 123 197 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -189 213 213 -238 255 255 -222 246 255 -255 255 255 -164 222 255 -24 82 180 -0 90 131 -24 82 180 -24 82 180 diff --git a/graphics/item_menu/bagmap_0.bin b/graphics/item_menu/bagmap_0.bin deleted file mode 100644 index 94c0af766f249188308f328dfd95d76523012fc7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 36 Ncmd;J;3NP!SO5$N0Hpu` diff --git a/graphics/item_menu/bagmap_1.bin b/graphics/item_menu/bagmap_1.bin deleted file mode 100644 index ff1b44740858ce61a11b5a2ec4ad6eab857ff386..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 36 Ncmd;N;2{7x82}Hu0Mh^f diff --git a/graphics/item_menu/bagmap_2.bin b/graphics/item_menu/bagmap_2.bin deleted file mode 100644 index 167c246f8967e8860e985f6278c4d5aea1f89ecc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 36 Ncmd;N5Fh|K82}V|0TTcK diff --git a/graphics/item_menu/bagmap_3.bin b/graphics/item_menu/bagmap_3.bin deleted file mode 100644 index ff1b44740858ce61a11b5a2ec4ad6eab857ff386..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 36 Ncmd;N;2{7x82}Hu0Mh^f diff --git a/graphics/item_menu/bagmap_4.bin b/graphics/item_menu/bagmap_4.bin deleted file mode 100644 index 167c246f8967e8860e985f6278c4d5aea1f89ecc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 36 Ncmd;N5Fh|K82}V|0TTcK diff --git a/graphics/item_menu/bagmap_5.bin b/graphics/item_menu/bagmap_5.bin deleted file mode 100644 index ff1b44740858ce61a11b5a2ec4ad6eab857ff386..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 36 Ncmd;N;2{7x82}Hu0Mh^f diff --git a/graphics/item_menu/bagmap_6.bin b/graphics/item_menu/bagmap_6.bin deleted file mode 100644 index 167c246f8967e8860e985f6278c4d5aea1f89ecc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 36 Ncmd;N5Fh|K82}V|0TTcK diff --git a/graphics/item_menu/bagmap_7.bin b/graphics/item_menu/bagmap_7.bin deleted file mode 100644 index ff1b44740858ce61a11b5a2ec4ad6eab857ff386..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 36 Ncmd;N;2{7x82}Hu0Mh^f diff --git a/graphics/item_menu/bagmap_8.bin b/graphics/item_menu/bagmap_8.bin deleted file mode 100644 index 167c246f8967e8860e985f6278c4d5aea1f89ecc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 36 Ncmd;N5Fh|K82}V|0TTcK diff --git a/graphics/item_menu/bagmap_9.bin b/graphics/item_menu/bagmap_9.bin deleted file mode 100644 index ff1b44740858ce61a11b5a2ec4ad6eab857ff386..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 36 Ncmd;N;2{7x82}Hu0Mh^f diff --git a/graphics/item_menu/bagmap_A.bin b/graphics/item_menu/bagmap_A.bin deleted file mode 100644 index 167c246f8967e8860e985f6278c4d5aea1f89ecc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 36 Ncmd;N5Fh|K82}V|0TTcK diff --git a/graphics/item_menu/bagmap_B.bin b/graphics/item_menu/bagmap_B.bin deleted file mode 100644 index 4da8f8ff5162390833dbf2715235a150a9fd79c2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 36 Ncmb1TkRt$%82~6g0xI`4 zV9CAz0&DIu1QjzBcQaHU#Z(LwK~pagw1pw68At+A$hjBifc9?oba4#v=-fK};-qE; z9@m*SC9mvCm7iN!|K`{K`kf-ehT=*aZ{M5V=Tuy*(0I-AQh4idmOFW5Ba9Q-)9 z{?$6|-Y_1v)r?P9cqto5=SaRX627yfk7X)DWLVSew1D#lr@a_c`Vn%S>0i*4+9)<==_VbGMagvi#muymuaqn)JrZM*_l-LS* ztYnMOmvUryxFf3}wN?1p%};gpvHa%qFFfbTP`$fljp*Ow4Rx-(_JJ1@=H1J?Pe2Cl&ZVT>3ZZi|VelfDV4k(#iH|2U4R-ayrz*Q=araeg5|K%NTF(2Wy1d z!(QDGIn>;E{`oVr_omIlP04>+@}~X>7AVdZ%=sCwARz7@mF+0-BQhaQ#X^dK(fDn4 zjorJ;+AK02LQi&SzH9GhYn*=QxqsmFqkj{6|FcJzZP@rfiH{!??VhfFF6*2UngDI} B|KR`t delta 477 zcmV<30V4jD1)Btr7!3pi0002N5bEoALCjGRu+k2lm?BlINO=W6K`S<-lqGXEuU#socfNCSHWx(xB?-OnKF5cP zF_0q9%dO=2*NPH9zov58nYFWXI3T5(i?>@YPL?zQ z48g%AFFgkc+Zu0txx3+OY2i!wI+NI&9$t;5{2)J3CrEMXUb@&itemOriginalLocation = 0xFF; sBagMenuDisplay->itemMenuIcon = 0; sBagMenuDisplay->inhibitItemDescriptionPrint = FALSE; - sBagMenuDisplay->pocketScrollArrowsTask = 0xFF; - sBagMenuDisplay->pocketSwitchArrowsTask = 0xFF; + sBagMenuDisplay->pocketScrollArrowsTask = TASK_NONE; + sBagMenuDisplay->pocketSwitchArrowsTask = TASK_NONE; if (location == ITEMMENULOCATION_ITEMPC) sBagMenuDisplay->pocketSwitchMode = 1; else if (location == ITEMMENULOCATION_OLD_MAN) @@ -1152,9 +1146,9 @@ static u8 ProcessPocketSwitchInput(u8 taskId, u8 pocketId) static void SwitchPockets(u8 taskId, s16 direction, bool16 a2) { s16 *data = gTasks[taskId].data; - data[13] = 0; - data[12] = 0; - data[11] = direction; + tSwitchState = 0; + tSwitchCounter = 0; + tSwitchDir = direction; if (!a2) { ClearWindowTilemap(0); @@ -1176,35 +1170,36 @@ static void Task_AnimateSwitchPockets(u8 taskId) s16 *data = gTasks[taskId].data; if (!MenuHelpers_IsLinkActive() && !BagIsTutorial()) { - switch (ProcessPocketSwitchInput(taskId, gBagMenuState.pocket + data[11])) + switch (ProcessPocketSwitchInput(taskId, gBagMenuState.pocket + tSwitchDir)) { case 1: - gBagMenuState.pocket += data[11]; + gBagMenuState.pocket += tSwitchDir; SwitchTaskToFollowupFunc(taskId); SwitchPockets(taskId, -1, TRUE); return; case 2: - gBagMenuState.pocket += data[11]; + gBagMenuState.pocket += tSwitchDir; SwitchTaskToFollowupFunc(taskId); SwitchPockets(taskId, 1, TRUE); return; } } - switch (data[13]) + switch (tSwitchState) { case 0: - if (data[12] != 0x7FFF) + // Animate the item list being revealed from the bottom row up + if (tSwitchCounter != SHRT_MAX) { - data[12]++; - CopyBagListBgTileRowToTilemapBuffer(data[12]); - if (data[12] == 12) - data[12] = 0x7FFF; + tSwitchCounter++; + DrawItemListRow(tSwitchCounter); + if (tSwitchCounter == LIST_TILES_HEIGHT) + tSwitchCounter = SHRT_MAX; } - if (data[12] == 0x7FFF) - data[13]++; + if (tSwitchCounter == SHRT_MAX) + tSwitchState++; break; case 1: - gBagMenuState.pocket += data[11]; + gBagMenuState.pocket += tSwitchDir; PrintBagPocketName(); Bag_BuildListMenuTemplate(gBagMenuState.pocket); data[0] = ListMenuInit(&gMultiuseListMenuTemplate, gBagMenuState.cursorPos[gBagMenuState.pocket], gBagMenuState.itemsAbove[gBagMenuState.pocket]); @@ -1332,9 +1327,10 @@ static void UpdateQuantityToTossOrDeposit(s16 value, u8 ndigits) BagPrintTextOnWindow(r6, FONT_SMALL, gStringVar4, 4, 10, 1, 0, 0, 1); } -static void CopyBagListBgTileRowToTilemapBuffer(u8 frame) +// row of 0 is the bottom row in the list, up to LIST_TILES_HEIGHT at the top +static void DrawItemListRow(u8 row) { - CopyToBgTilemapBufferRect(1, sBagListBgTiles[12 - frame], 11, 13 - frame, 18, 1); + CopyToBgTilemapBufferRect(1, &sItemListTilemap[(LIST_TILES_HEIGHT - row) * LIST_TILES_WIDTH], 11, 1 + LIST_TILES_HEIGHT - row, LIST_TILES_WIDTH, 1); ScheduleBgCopyTilemapToVram(1); } From 86c21b8e79a8aa2789342e8804dce68320b2434b Mon Sep 17 00:00:00 2001 From: GriffinR Date: Thu, 1 Jun 2023 14:33:32 -0400 Subject: [PATCH 5/8] Colorize menu icon graphics, document sMenuInfoIcons --- .../dex_caught_pokeball_and_pokemon_types.png | Bin 1803 -> 0 bytes graphics/interface/menu_info.png | Bin 0 -> 20869 bytes include/graphics.h | 6 +- include/menu.h | 9 ++- src/graphics.c | 6 +- src/learn_move.c | 12 ++-- src/list_menu.c | 60 +++++++++--------- src/pokedex_screen.c | 10 +-- src/pokemon_summary_screen.c | 12 ++-- src/tm_case.c | 10 +-- src/union_room.c | 2 +- 11 files changed, 67 insertions(+), 60 deletions(-) delete mode 100644 graphics/interface/dex_caught_pokeball_and_pokemon_types.png create mode 100644 graphics/interface/menu_info.png diff --git a/graphics/interface/dex_caught_pokeball_and_pokemon_types.png b/graphics/interface/dex_caught_pokeball_and_pokemon_types.png deleted file mode 100644 index 4a9e67954f7b2cf67f214e3c4cc5038e2401f2ad..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1803 zcmV+m2lV)fP)=8@!9~f+&ysV`lm{UENjHJwwCc{{GM;=JN>+k3Y{o z(o)Rl1w22_vi*C*Va(?TWLfs`0RSPN8}M<~`|=_B9`pGDpZ3oU5c0VJ=b_>Gs{+1$ z);~Y(4u>(H8}Ook{#Ebsa2WGf0Q8@EfY0X!3{QK#Q!T}OZou#~v^#y3_6m4C`7Z!| zYUkv`-!F6W?eqPdJoxoECtpxIk;_E(6FE+Vwu`*Y+k~`;!~hq>`a@;_-YZiXC&*D* z0f&4@)k8kE1OR4sPV~BP0EnQBlM(=06V{Uou-ijY^?+?x)HB5hSjE8?ZuK$(%IF2} z>t6xKhgIf7R~0@|fKz~~;3xuU^%9 z@O0VBsh}M&6(p#zeUl0poxBR@y{d4`?;KWb792+aQPBgS&4r7z;0$0K1>klC2#I3= zc8aniNRT2C1w387MCqx7S&;iumiuK?%c6iIIjV~Ot4D${cx^*^ZBt&nH!dFVqL-6z ze%#8*2fv->)0R<3m(efs5F0%q?g%}B+xD{MC zzyVe8qlyQ>&ucw%c0Fon6CK_FC(-v$oJNinZS;xW$`S#+vzjGxR^u}RY@#jS1wjET z{^1^QVt|YfD#9Zb(8?!gwWtDm&s&??fi1Knv{Qha1Z2cnR6%>-A3st7fKA_n&7h6e zkt|05R0x1~qY9i?VH0{Pz>1-s15C_2bXxj}bQ4MA17)zpO2#lU*e8su-@nqhaK%?^$Q01wPKi6*r4q3Rn0K9U03Z}7 zzzM0_D%kfhzQ!LV1?-{++;Ju8lmfs4 z#G|MJ2LRT6XFZ@b?LJ&A0JO**p;83+071S7ZI|wBs}WD zqzY|r1F&7xWgZKBJF0NyMk;iisnF%T3MXR#=@tz;1bDdzknR~G0L2pOxHwk90z?2v zdq-@8ph*#c>$SefwOp^^P{6M2mSk7DQrZmwkyBZDBz_Rn{lVOZl$9d zxTTX}>pPKp+z6miZ=G!nx-1&O-qQpx zsJ0X3j4B5l0RuImfw!a?fYG-Aiw6b>Cn^y@@XG=G54Jo5P-go;!1qy#fCE?21z*ed zWY(X3l7Q5w0QzNswJ{O{$bnQ?JU~3ag>M>DY7kcPr~*o~W(LfKh9J@67@#WL0MNaF zPn-u7T1`zR0H($49v}*6TOSXuLJwL9&uqoP6d)OcYr#Ii{(Vh7Kw8a$1_p@UG+-P^ zX3j#oA4ubY0R#tZ0(O@P4-u^?WWkmRliFh`mV2;a(_y$=(mfbalw=~<5$_%+cdYSXDN z$P{488^-{#^>rp-wD`}82abI5GQeo@e`ycg48ULtFy|PA+pzfOFN_J8fV$rtIId6K tHL`=@4QAluf!`d+jJw_#Q~oyt{saT)Pi`6v*B<}?002ovPDHLkV1kpbE^Gh* diff --git a/graphics/interface/menu_info.png b/graphics/interface/menu_info.png new file mode 100644 index 0000000000000000000000000000000000000000..a6a7efed395aa536cb328037e099b3d756bcc459 GIT binary patch literal 20869 zcmV(%K;plNP)C002rfdQ@0+Qek%> zaB^>EX>4U6ba`-PAZ2)IW&i+q+O3^gmfX0uWdAveHv|G88V&~p!L@1zHT>EebcI4n zW!~o1)yLC zV}1Sht@Za`zQ29_L*!eD-_!foGC!~Hd_VvEfqHztfBpLXt&Y$8w9gxbuQy)*OMbF{ z{=BYz-YCWQ`{DEV?fm>)Kfc}0=f5~UZ~J-k-~WD87URymUy56tDWsjR%}+`Gms02V zvc3jh6jEM)-uW6*{qx#wUw`~<@xK1_+uH5@^ZoSeQfzzqyrBHHMxXD8{M+}_*T=+P zt|Hy4gA(+y#7Uu(s6 zMQxhPaOeEWtJsk6eAYCt^?|f+Itvf&6c}4G6ywY`C`6^ev+I3!i zU_Rp*d6ZE{8|UbEywlC`zsp^>yWQvAXPB7MJZ7F{*4gGc`-81L={cVKl&3!JIiLQu zYoA^Hb=SggJNM7K7CyV?jvecD_2;hf?OK1lMG#K1d&Z8%Be3Ju9l)TYd$zZ59MPR~ z&-POQ%aL6R+0D6wJH`$kGsOIauf6-ZbN{$+TR#4yeT#p$bDLZD|6}Jix9+oZf8Dn~ z?AqOzM@eggJcX|5o}O*(L}7Vq$YX#OyytnPGVjC(PL|;TbB;c11R+rN6jpMS?2&vwn2k2}RN z@^x*T$Y<0i@U_%4RxXrlug@hyrS+IlS0LPy{}8r@&dvBi#W90va_Attb2_ zSLs)019;ES`(R@^xhDp~nJrK0-t2fTAh_jT1Y<{Xc9cja>MBRL&?955oRe!@)FRq|o3+xDL?^q+tK_D12#z1=QH zE)C%99Xr3SW0w1Q3O7~pL!~}vi@k<{VGmYx?A-Dl($-oWyu)3}U3?j5ARXreXL_#t zW{sY^^qK2C!gzArYdD|Gu{p5ae6Ur=wLklq8|KalX6M3nv#j;LX1ZAgXdFPI7GC-E6UOi{7>%x*2OkREZ6W9(n&}QTa^D+5h znFNguS9bP$EU*QV^0P?oIMVYRJBtJKlyFVHeLwe|v7YeU09Cx*i^)l>ti-st2VA@3 z%xM;|BeFLl zC1jbKDtN>@J^Vm|y&qS)Ayl0$nd55xsVvz!DyoK?Jg+UZ4r1N`tZB3FKw`lb+}0M$ z(|$>*StlzTg&ZJ|mZX;$AnMEPgybgOvcPGrp7~iwR;4$(8H*Y-wEM zXfS{SwteoEE#PExEhXWJf#RJ*8*$}%95==g%N5`Z*a4@h2Qd5Owe5=cgu?*r!Y12P zj~K4zIfTlDlVf^p9cJI)t$#MNvtOY_s@du!Z>9%zns!$38Iad_`Q$-(_UV+;?? zK-(&|?u27zpYi?U;Jl;}*5ND<2Z0;U6?7OK_Na0g9n-`*PJR11@mzQ7@ZG~@!jw-o z8_TXNTaPXX-^l>ld0ah}^ZD`CIA^xxSW6D=<8Gj74;Jy9Diu6#^@=#~5oB*6fQxJv zfb(=t$XW1{>?P-kmElXef@Jb|M(QnK{eV`Sd%j`d72gl)zz{~7gVS);6AsCVoVA{u z(y&iH_-f@jVV9^-J{-H;OZ4u6)@KLk;4pH?8L&A%>B19Tyx+}bvwM;K2&~TorvGryPT9gw;Sw~P!51cOa z+E^!C6zkA|Rz{oK^5o(4geDYSYgSWl><@&PQnOr0~qC# zn&&>H3vQG2$@>JZ1F$}K{M@y1G#>~HM23}sB)AUn08a0S`977K!Wzc}e8X?tnG+Wp zuIYjK<0wH6q+{K#9b-U!g6wbxPEEne#yW}YFX&vBN4eNB^}!?WA1Z)vT;jt2Z==TK zI<{GwDk5bztUd@5d<=GpVZVsmz>LUo$3CwEwgsn$u;94{OOTFju?Fny2GUdCxn++a z>&5{=<=;n@(cq#V&UFTR%6=yh5WGb}6NKN7zvfSOzDBZ3e>&qycz>_oWKR zO8#*7d&TJ|xdGQX`gN5VBP^}~h!_`Mqyx*n_&xU76#!P)6_|_+3KYdbp{vTs6$cwo zs5nQ6a)p`jN#!2-h`1wz12J+$kyFBPzj<9;4o>{$I6+Hpspxf`Y6HM)=imp(EJE_Y|FHUb^YCDPMWZ{T zCb-ZR$Y<$xNeqSqR-h;^ul)#JXD!#g1vGxH=ayJ(OanW>XYgJip!UDx)4&HwH7|Y= zuIIXD&xn&OQ^a3!Q4nkSU%-MxxHen@W_MtaictJ)$6sTaV=8AZ`CCf~Yw5DQeuNJR z?!5jx2j2cO61+Gt6nvnGPH>&mfMdI3+_yy+@Nir)B#J{(d?!}tocWUG?I;FeqmShj z!2FH-vGqeJp!y(5%g86v0 z%39QCI|Gnf@M&eTH!QjD6{g_JeXdus^_T$m4Ctd6z$HC1P<<9|xjbsBh-L5M{En;` zhB^IO@fe1pVz~o$mQU=1_t`;iE{c1?N`|1#Ucv|Pw(Ob*EZm3p(&3Jv9Tw9e%n~}@ zX`gJBEQA9D>)^iNdfW~m7bc$vNZmEgxFLA4_dO%#u;9mYfnX}~sDW3mPj&^l;Anh| zOTbh{!Kjo=FwwKR6KsEZBG-(!RJ!m2Y?os&0Lh@q0T5Un_YgU$7rN`AkG$ql=ECWb~3m9>1c!VF}4I)AgV6xtHFKl z08?>u)j21-g>y&68Vl6l0Wf%Zqffx#ghbpwZti;hG8e+mV9fZI-o12@R%hT&4(|YS zfw-&y4)&Uc7qW3B11Yv}FoB9lIlu&u6&J~X`R5&Rbg)lBG~pm1+|E|_9uqJYy!jR>Iao<|;LLf||w zSIHWTi*@8<^?rCZC1`?8#?U02od;CUJUGp${CGbp9nM%M?z0g>13p z1L22Y;|SK}(~KUT&{t?HYkT4ypw#lfr9^_3%dV7KINL>_2`A(On2#HFnQ)vDnh^%x z1TY2x&luSzfbfnmJe)ggheK~t&@Op2zE?$)iP3cgf$z#VqBM0|+CN7;ZI^G|#*Hw~cj73Ia1;mlCa4|`jX3b#rXYBM71 z&aM1B4F-&?XQDO~rzP?pJIXD1h9C2y5CoH@K7g`?(oyzpky0 zfxDPxudG--0e;jJr@KI3a)i|4cR4_}WV*Z>0e_bwES2L?mP5y0fRS}v6C|!>LHvYD z^79}Dy!cdXP9%bM!JF43Tsv!D5ggeV$qg%1CdIUIlE)cQ>3AGh7yrzC1WqK!?-Ex9 zCq!7f=HxF*13U@K!qQ>IfJ-wwxizFbbUhqUfvZEpI4lN(cnPyoyYGShKk!Vn?sDNtS+1&Cd+>Al)tmu`pD**iCi$G5! zf|~~mH~_2JI4H_;!IdjSuW$gscqJc10D*EQyz;n*nG&F4NW<`J6H`Cn+4Y!$-rmE0 z9^sx5u-DW;DUeUD&V_M&IP*wvd^lEd8Q{h`pEN(ay>Z4`grcxePd<%9@CTi!KlsQ( zMY@+AAano_jzIz)jMm<5;7(6`&$VUr7b~1ICkrs-nBqM5N9NN{)|9i9jjI?;?lMa- zb6pljXslGPy&oZMXWRn_B~{I9y*hxn0jDd5k2pOMqh11aaQ%J7&entLU}!g6kVW?7Y>@ zFHjap+mD_1RxH*%aiUYKsAfnSK%Kb&Jg0_+y(h`f5jXBBN0W93^ab%&*voEg8yM#t z;o*ky0uy7}C;Xv+Hal;7U<#ABRu8)O;yKd58O-({Xln;Pc{ zRUUQmkWBnbG=aClRM$4+@CGCV*E-<>3H!hTo2m)QAngki5)9omXpr@=a1E&S4yVRi z%Vv-xokfkOdw5L0PGj*L7_NDmlHMWs=gm<`U|43sIal>G0*MDf>E=gIYltv&p`}JV zsX$VcAV6enxCO&WMe(%5kpabQI0$`ugGZs2m{8j;>h>6cjmF41{Km3$YU{+EuxL;K zdi21q0}ca40qBKr@2$gXuqWs#M;f+M}Q^ zdE*|ghA+WmaI(S3(VwtA`pL-Z?0SrbE;~amD<%R|!_hmh!&glhDnOd6#9yibpj^9W zidESA*e>HbsELJ_*X@2GLoiNIkXzzS!DQGv-0;{nUA}Rcv#p%-vU|N0G8%o`(Q^OmL3vu91o1ytg-0-xJ&A302S{l zQLG343PU_Zb+*Y2UI3?oU5ph^k9+8dnrH+HvjPH4{lP#LJ!o{84Gsg9hZz^I{P%cC z_!ckOrlC%mRT=~Kbivk*mZWei_>hyxha1*c8$3k{fGCuMfZ_b$imrlQvu*>X1X`38 zBZR@{ta$nnDG4m^2^(5;?S7L$l5cKOARl4p$B=R(C`AWU#LIXG(- zB@_}4iZ5pWc0~J*xU1@C$OP^P{J!^GHY@^zWtm}K__looBe4`YM@7&*NC71#Ky)0* zA`#TZ&N0EF=P5k3fbMUbN;=@gSxfw=K}rcR3u8FCa-`3TQ^InX-7#96n%SsfZUtyV zYrm_oHGJXo%QD<9r(qunH$VQh4DTu=tB){v4-_7zxr#^T02_;V!_aJ1xs+lji=4Qhb`5lmViq$# zhRG&Q-!KNjh7E|=(+@+?#%s?VdV_s$*WTwuXBehf< zH@h@lGho4h@@A~3bOU_NAk2dR0LZerSLkwH!lAlhGc;6eiHnN?9T{n>vOvB(dpocr zPCE=`(V1ZkubXFk%px8q;`qMtNb=5fEi*os`iWyV9doLYIBwqBldovJ2ru?06JV2~-|`?EPH&atc$g!6n=bWl^+Kzs!U z;PcdyU}Vs=6Mq%BLALOTZ1^@|4H!v{ynh1=QQOuU!e$Vwb>Q+aEaZ;KSJ1^641fe!UCFW?rwPU+_`idxlnF%B=x%B_q@U!Bh-mCUQh)!LQz4yH$3T*P+%<%0WXCl zIMtG8Pov_;0p6)o$0k>d&Gg7&&I{j^^danh@5fdQqTqfFqJf|sRk(VpYHU0(Y`wJw zD{8FUgJX{DUe=X_W+*t;e?6Ny5o2fN3u?I!vm*yf2!5@+*SvwSd%2;ZWfdcw97*n% z-(9YAGrlL6zZDSBJ$`N?eb$MFUcs0y`F43T=4~0nZVU*E4Mz4cS77PfP5{25N4xpv zGJ4h5?r?x}H?+F=2Sx*opDU|$re@n&~s=Hauq4 zAIP%oFb|k8{D|XdU=g#t)%AEK1XScy2U9NnlVoHGcJwxjwRu7hcY&M0*>Jbd$$MdK ztMC_=4L*SV2bT!Vfz&+#vY>2MuCJejg^$gghYo`CQ0NQXS2hTjz}T zw&A!7K02-np&JEl&>t3h2W2EMjbUfOoO`%*#o3Vl^=3W8i0EZ*fHi{3qsh<85s7UD zFi;V_>wm=SW&srhNM!=ogICH14G*(YE6d6OO|LsT(JSo9v+|d-&D>Wu+4Sxz?AY^5 zu6PL=F{(b9FPb!tpdLQsGQjt_1xCd2-BP_z3w$I3{HC8tqb5r&1yq%Rsq_M;=+4v5A6An z!W`xjy22W0Gl+GY4~NE}K?iO%qQyu(-B_zy{a5m1vp*8Mw?_;Yb|BlQj08nzCwp874x2IF%~;@Uy0+{jN_9O*V zH?$?z%itjC{$U(?c1{f*d>T>(Inb*I;^OxJA%1lGiV%8^5-T{&b}p(1ZBjDvgN@yq zO~nHHVv|}n9QkA<7*}jmer`u^V2!tJbe-=Y7cLW-EJ}M!Iq*6wQ>JpsQRXYizdfvErS} zMHho+y+(k2wuKjtK){XQCurJ z5bX=AEJ}jv`Q^fl2R-clWcM}<)JQffVzCY~)bejWpVNLDe@s7wp1J~0VvXbj;A8fH zf3kAI>V>q)I$=go^>A8g0$IYQ%|Cj)qX(ijVcx1;J~F{ZxuSDgt=!8B0`YU!AAOGk zeG3AyspeXB=_;FP(EVo&==miEG-}^i2#r;XX3LS|XGQ=;K&fREIBQ>Zg2w@eONRA6 zfuQOxSp#P*uIrA@RmS)R<1FRi5^gmF>;Wt0uqBJ5!I9^H&$Bef?@@rDLsi9@A%jY6 zZ?YSs-mTU@K&e|-iBzeppn8WFa?h&niQ6oT*m09zvFPWGMQ(395RoN(3Npju5k{Zb%#c11^cngH1u0fSw`H zYH9cmh$#dXZo?X-2p@jMk+x&C&SAO6!z(NutCrBk3W%$j_c2AG(epr}=rs$dX1N*jK-*}->3{A~a z=M|zdJy5{+`K%0SvS<~bsl#9UbZ>oN zGH(rd!-9>aanIJSG^7zOX#SSUs{bOD1=HK|fdzBwq;`*9K~+}nRg!?Q16IMpW)^x{ zDOOi?-p%?V3QtS3L3!xpxq)W!h`voOy(@4|t_iiJ!-M(bFm!mW1|8mId8q=}vO;}o zmQI6vC%QjESFPhbEgpElJlOgbb-)890U_rIuB;Bfo`9=E>Wx%aF1HLY;AXM)g#;!D(Z_zQ4RqZUK%ADa&{fDRo!|`79p+44Q`1AQKds4}xaT{OXk2 zbFs!)^#c>I!i61TLANTIU};U%Spi(w4o+C$2uH|7U&{&@tW~`%#>Dqs@+kBr|HBOA z+`ve!9C6F%hktYR~wJ*j@WUq9xios6N(%RwJxkyPk247gzyqznqJvBt*%v# zf?uBqGTX6lCiT)?Ks@~Fxwyu0z9C-gG_lb5pwRH**8tzJSL4Y&kcbFu0Zu5E;vJGrxDiT!SebHfbHYvl;mnG}Ghuo=7W^db|ZF1P&Li%DfaAtu&{KXC)Sq8kDutIYit>6RE7^hCi%HFg>1gpj- znD@lF4lA*N23!$Fow$pJU2IkepVGdj;exq_n=B$Tc{VL07Gp7SNCOuRy$)t3P48i0 z5_I+xgV;`!tJS;2+Bp;8+KG&?z$gOhw%y##nWPuSVr2*yxB?N0S zK#FCXi+u}k{LXzB6M+^yAz3Gw${FI~EK7y$0ygQ@2B3w$e`%AGyWZw07v=8=M_hG( zlP8wMTSd>>W+3X$sFN)3Xg6x5+JbfPK>^uX-VFR^yad+1i!0E)rFtQlLz8g_EBA5wGgGZ-Dh}&sx}s{)Y9@={#azxoLOHGSeAoscg0RE+S|?>ZF>NSiFc3S-!{UlD z5X}{1&ZQa(LCL=A2VxJPz2*~F3>T(&Us}(q-QRu|@0ahz`^UMeX25k1e@8BM`}dDv z2^VYH12pJ<-dve^aN|dx_{j)pExRCbKmbQuwXFyMti@z6yU>U2R+7zX7ZZL%`N6-I zh^9T^o85Z5_aNsBh-;=Xj|5@PbH1hDsN`r7AV;|whb{c#=2n-bQf;$zl>fycH2~RC zz^rU#JG;F@(Go$c;@8ftEHW>`^;outwt(HV;Z<)X#(s3mTkR8%4+P}&JM58MeeN6> zNQT`71~%}A5ko21n5+r1G!1x<4y(P42Lgq*q~O19Z!B8gc_ZTZ@JHB8)^4B`^xxAm z&C@qi=E5Cdhh>YloIIu{6#AxMU~;?lNf0)y_6@ko4k0t6FOBkc#vtKtRXLKD!@aFq zZc7{%Dk5H20=TM(F*hJ^np)_VvrK~}(Z8Heh36)PFk5PUQ|E{vOV+y29zJ@SGqp!c zELfbRA7RtYVS$Z9mw;gvUd^H0@yt+R)?PgF;(Hc;F;Y1g_-(?nh8-^vtabib>I_>& z52_h$;9wEhBVEbH8p5Wx|FxM~YeeqeRS*c)Rvl<`|m z64Za@$S;{;vEnh@!-Q#v)u4Kf8+}J|jxPS}VA_)NNA)+^2QL zr%{8sw-x)bcCB$SHB?)1?eW7vxXSznE*}dX`AD{POmGE$bXXMsAhZ^hQrp=z11g&M zR7XG;g(CwX=u4AR2##SiQfk%#Vgfr1B)VD{SJArb!DhTJDpF}UP)!9Af)RtLT zC)_K%E1PM?qur2F1pKu@ZLqIHu55UD2MAD4W@D{N_}2KSw=q+VS1sXa>JVW1%?YnI z4`6<9*zjLz#r$nNzJjtFqyBTu|FJUM_eHa=?8UhPCaE7N^wZ_-cCkr}iDi&$Ls_U~FB1D{BW->P)ilPrz12Jcn@lZQ&6D;DV?D0_Rqb)H9X5Lz*Xmy!7bi>N zpvW~gFu(~rB>}T>#WyDj?jlS!BM;Na0~7%_I(KMmGYSt}-73c;ajbJ*ZAIqt;blkh zCz_>X;o}SP7IL(8BXUMd3#+nws)`}rr@;}sfXpczthS|OH;|ZZYZ%`ayIo_ucE!}h zu2$@LYP@x2q=4`p1tvx zvKa^%wywZ158MOGjqU~xvMTmH%{JYrjtpL~GJps-%$aj^0}G0CNOe1+5p9!t`*Q}9 zgitSg;Nad(<`vN)##J~ou=&5;xy`Nn)6NByx#|w98btwVAjqzF|F)yYf%R%e0Sq>4 z1o)%+4%;v+U>{aEa@w=7`mj03O3QX@WE&*2M(hj>=Yo#gXM+eed|0g8WiBGN8dk`Y zWxnm{sJanR_*nt<04yHRzj)gGtMooC1nceVJLh)t2^Y{1F5{D?&`(tV>U85ovTjLd zWDC?MFxmxsfV;7Yk8Qq(@k4H{-0w~*-|D-S*2X+RoIukU=$or~6~`3}IbX->;&?1# zvW*iI?YN`PdvpgMylj!H!+#kUHP-}vNG6w9j5;~F0Pb3#hrKwL3+IAhDI5{a$Y^y2 zd^yxe(8<|thU&c<-fY+_4*ehe2g&pN-NlSmET``2gbMFfyI0K&&*(4?F055nF{eZAUe2m19AYVWpgHJ zpBiy+>n|LH+!pJDEY+m|9mIhT*NML?ElOVa2rYc|=sNb!mE2JoH$(pJB!--K+@A8L$IfRtGj-{@QNcAfjiu znm}YKi(%EYr9qLJQZn88$R;K3;xhtkCY&ZjTcj0R|GYrGO~5sayRKS5 z&cD6IYyU*SthI)x2Cvh_Q-*8mw{{JJoc_Uyp+#*+HMrg3IJea z?B+6%3CV(H$osT#x!9Nr89z!xT>vp>UK5O135UZxaaCQ(BRS!)!cE2}y=wASH2lSu zf_|!UL%8EoXexHmLdh;IK9#FQeht%y_zKH5O5N_S80!V{*<(E_m*{AnUzJNa!;7JK zH0~S=ooQ8KzEwrrs!UjIE_qsIe6GqAVeUs^%JoV^Yf}z*8|Y`R@M*B!(i3b4ORt;7 zVM5+v^SaSm{XPW7I_hC>2Ih|+VTJaN5&r1Wvr`hnYkUQ-Z3-HXW9aPG#4_YyRY=_T ztJG|9vt(-;xq>oXqfb+m25o|tnX0W^0L`t7944HVPJPYMFS1uS3f z?cD1a(6!>SXIoWJwrI?K!yH~BZ1JK+8GQb(<5de;CXHQlw9bj+xlT)*aND*+X3HC@ zjo_Er=?$H0BA-*x&)s-kdXK+|4U%-=@N9O#D*SDGNoLnqD~}qdbz9YTIAq^tK<#05 z(yF1#E7W1>js>i(P6IgoUY~{#HG+$R1~Hcc<4&EiI`MF$cbtAM_-=@Ut7 zzq8#u@q)A(%3#G+^gp}NqfT?Dz55JgUIoC&TpwDld*NPsO9Mk zGAtLt8+iy!hx;S!fYj9v;L&w$DsAU)wbfRR<~L-8*FU#aR9QPj7}&uVfuddfJRSP5QyEts3@DyB?V`VtgC#~m}J>4 z#dipey}&rgV!zy1r@PjH!Pg~Pu>z3ODr*#yVMA;yp%)UGWCmb-(HS}i#`yGpIpKy?NeGeo{20Hq`V{O}v#R$U z!Lz-^Qfms&>iOol7<@k+B6Xb#SYd>lfl$AG1(9!t9uEtWR(0OCpM3P5RyAql4NeDRp(IZO0aMptIigdOqS=~T ztv}QVhuRsZIigdGj_qyYh95qTNs;i}9x~uIIAaNP8s_0y(y?L)VZwYNxWKDBw zwLVuGv)QT>`8L>PpB^9jtOg*rOt+gpc{5nm^z&Is&27e zr*IHL-xqy|dZp+v9vtdh+`oD8);=F^#&w5!CfPS$3arF)VZGdz4*k^D_=`Wy3AWt; z*EsKvI6PrK9Bux^?%^J$(RTxoj*mhD-K)oOV(dmU7B#CIBjCZA4VD>)u)=a(Qnl?LGJil9_9O4eGG=F_qY01Z3G^|TZ{BS?-4$g(8(Zic`KnmEM;xd zX7HM&f%iC_Wq5Va8NlnbEpiQo#_if2S)f~uJSS=JvNEsZ*Q?4Y@zaM!*f z6`%1nYsQUz(2#HEF4*E_k`_u|9XV{@;8{G6GX7&tt|+@Lgq(4yc01QKRaSy!Kg_+@ zkgOLOKoC0PUKnB8B^o@G??1=BB`8(xtCREy)<4Z72Dii#@_Nso3ul3s#SK?y6YwYw zuEIB2&C6yW*Fl@Z81?C7*uF+Rpw1j)yh^LHUOYLoqd8`@m`*ST3lkhxTo~+TdA4hn z{}_kD2S3*vE{@4BxEw>naEV}cAHRHBGjN+0*ukX^sW-)X;MqB}#SDer(T7o#y~I3EzFX5;+mRzN+N!zCQG zzu=?Y$2P%#@G<_5kI?v-;Nw3-;n#U&n{T+m=D1;~Ml1yeoRC)=R#<|yG}hn<-Ni1n z1ZR>y7?3`>F^HedYYW4}Q=4s-aS2IukVXB+#tOkF^UA|PjYC)?#~eL5FPp-qaa_9# z2IPRXdsaGejUnW#S*NONL>&c#P!3KqJjbeY(49{0c-PpR&+y#_)=UxuJcp?`L*Ccw zW={djw!ROC2bLNpR_jg$+5Ka3FRIufGv9M=WD-iH;<*iWmWZV^^7G_2d=2rHc}q`obqdrZ<^UT&1-^~YF%`6Lv!p6MjlvTR<{bv)~HIrnglvKijufK?mBK z|KO~mZC|!nhbQM-i~NdBehpRh*(vW##qBdx(Hhw9AR(Ll*8r#6%52jghUiyV*l6|2 zZ}rQs?WfAk_NiV~v8d0<3yFZLN2l#VQ76Bh8%Hzh}>xeK-ieu{tKJ zlf4Y<_=pr&IU3OAVDhKKiZ|@g-Y?mVvpX*!$${3kPCH5qaXby_onv<#x~l5z2aXFT z_jJ9Wu4%Ul3P4U_4WV)Tu|4cV8R=jtOSIb-PF`zOlHmI-5UZELjx~m}*-m>mIoue# z^F_LZ=h&@cDrRtuIKxjQ0+zG$A1Ymvs|3$$ zGy!*D*6Fe$`GJjePP{#q_!7LdD%Jr!Wlg`g%-E8rRW_cFRr~vM-YDV`ti19XT)E*= zZc{26ukd(TFy|ysJMbbN-sX(2arXF~H3khw`cB5b-jT~QZpcCD%87D;+l}*`QvoU8 zFNY+;ks4>n@=~^Y)l;>W>k1IZ19Muhx9~!dlxMvEBBuD!kqSHq9|K zd0(sKXe*q~=xea!JTB`foDc`oVU_SZzZ9CqYn8&z@K#86r;oskR$Qy}^t}JDzO8|5 z{L8(74J$Uff$OMm=>+~1#<+vHK4rjpznoAht8JpEJUBUJu&D+^-{x*BQUo2%lCyN? z{w!rg=kTtzzyY14;8+`<=cY8& z9N)OM;{^15u#>lao_l2DPDn(W??m$pQujEI-DaDq$ z-GL9WJMS?;v>eHTX6Y-o>w^VsDl?I((B?e8STA*5Flu|AK2Iu^Qu|TUxjAH2D7FAv z;_L9fXgt|Ix62Ml6AyC@k1Z~qB`KCw9aa|I)!DnJqro{+E7ADQu5y&06Jy|>kXOX; z&H4KTqqzrXTVMmyPoE~hiL<6-hf*Bda^$EBtlkXm;Yj?&J)&~}aekocZhhdI`SckoW#x>=}hIj~vh;He}vx|7vP-(7~(Pk~0jdW9Xb$Yu*)~SsW6Re#BJF2mTUL zF+;W)Q#s$5%4*eKE#{6WSLck@E%r1N05oumG1+E&`SdDBkQEjl2aZhUihQ_^_TrTG zD!$uORXrF>7O#;d4y~~J8Hyc(K(xjT3P5Iw@xeK7srADyi#s^&=4x?T`FlGo!Y1JJ zz2aml3kT?d||X^Uk>&61Pa!wwb=3d%?ki{%qCqjcWgmb*T=p zHc5T2n!j&>F~g4r#@48{WQVX#<15f|Lb@6X@+}wqIbc}v%Ldp{T(WsZM**8x#hTJ- z51q5Cb_Wk6?m0PEXR7m5xwn^35rODBT+|AHEjj%)UH566W2`EN^$4BYN6!t1 z(m7PpGLO=1XStI+TyY$5dIk)OBapAn?3AR9i@uE`2;0CKk`|~?#`*B5HPV8^Z_yD4 z_~QfTmlMQI;QJdCVc2P~N`k6qSyuTh7u~E@^l@WcuLDBTxm3QhCHiG0vuSToQVEgl z9FQ0ZnU2#|?l~Q5`aBt61l>?x&0bFf&PgW#lB56+e?p!e3(8|Yn6zPTW0 zKG2}4nYxXpJ~GNDyS+~-xC{hE?#tN-s@>AJhU}<_`<7*(26z4ZPhV}7`?a~c7S}th z_86t8Bh@_5jvEHH!?`)g`+?0o@73()XimK4l-RzjwmQ+04J_}YOY9#`Zm17_;8s>! z&*tck!Sy_2U$d<`jQ>XEyum9r#2(x={)NSetleC*ZBDkxfb);Q$6V#G0Qx)zYkH>R z%`Ofw)d`Tp=i3?2fak9;FQ*4Q*w^^b>kVExwgJobY}@w_1{>D6KTomRkKbK~I(M2SqXwU9qWlF zfT0vGK6!4&lc%jqP0r%uOo~0{ww7|Vrh}H}V|RS>xwg1SAHIMYq#q-E4F6%D8|-w= z@L8i9(qcsKJmUqHPAEKvLNDy*FfSNXGjL$~(Sly{j%I8oQnZw}0ca7I?rSq-8BJSH zwA)RN9G2+J*Txmv`#WC5K&%mNtIn+W^Py~|tOwqx)onI%R$znRMQ_|T@Mf#E^Oiau zg$saF8(~*VIe*AU?C`OdIm!(p41^jbo)IFgbkP-=GqJ}-Nxqw;b3}m=4~IvgWo27w z%@XYWMm=0xUG-r$q~KpZ)eoM`Y$^V^u6z}U?M8d@axsohht6FV@2^7O&X=u!hJBUW zyw4gtabN4_&DnV;$+Bsfw!_#RN45Gg z)*6NX^(8}ziE**EyR2uOB29V3%&2vqHPuB zdcu?AD+IJDnYANUmjc)FsP7BtuRq5cd_L`0xWNIhe-m)1tHigg=FrFr`25o&MCTkm zcAbxH4S#nax}nO5o*u?Fx&IZNs5UZM4^h~0#9&1C1E9&-%GQjJU_R=&Lh_NRVGc+H zauHeLIDSb)OJVPePwYQ_k8rWlEGB)q!2LxAuDg|uokL1En;^pNPzc>YaXtgkk;+a_ zS;LZJe$w!PSU4{El*0>9YSlrBK09a`qz^1E&UzJSlMPkyB_HIsAYoAfr||8Ne}nMJ z(qiOQ^sxhmv)1sh%?D-qTx1*lP(IFPuulD4v5ACwwWt4Hg?^3+mfj#8&fN3M6;pQl zdTtv;;dJH&lFjy~P<=!q$Pkaq8m4Ahu5;MNZ6~%$0}!=F*vE@F?aybHVLls6wj8PUW01vxV2DmwGi7S=U|(>9V%!X{Q0Sra|F@cU*KB( zbWV1Ui@h38w{!t#e65i!dYmy0y843|}8E{yAo^4qKcKdG_>^B12eh}F0j|{emjXkYm3M&;%l{&s)E}yh%4X>fq^U$t{E#uTi4T_IH4Tt*86ktOB$*516&rUV;eFkCjaW zaKOl2CovsVSoZflE+<@GOTX&3`v8G9v*yifv>_rli<@?5X!|gryrv$6HR0R`F9NKG zUGN8#-Fkx+RMuTUinig?d#{y!_yp;W6`z4V4}rztwqu2Hvt<=p3gHfd__qBHm*3VS zfom>blaHKCXW+~yd;5TlycWx1X5hvr$pv|cj~9QwukZFBFYqb_NGjN zoa5a#oy!65=z~8C-{?F< zd@JZ*-xB=$IN39$zc^V(+&f)wx5aS2jITInNPltyb9pnOYgzlRi4LDr@hlh6mg)Qp z*$$K0o^V*k6c$bBn%zajo_oZek5rv=Mik?_Ipp6;C^}ovvt) zrgP_?A5W^vZ~N4)9w@7-Z&;M@KBvmQ`|X{+XHsg9*IxzhzawvLovz#3`#wI8a%G>L zJYIbE?(M;L-F!p_>xELRhRA)kt)T6V*X0dThaRUVpFd)0n$rGCpmx5IEv?E?8fJ0V z^Bg~qdbO}>1qI$#;M_OU_%qB;FYpT&*ZUkX9~nBW*D~c8j?c)Kg--K)AN^`gp^q6k zaoKe}^VGEC?d-WXd%wmSUT+2RZrI_lAlrwwyz}9Y14rw0hj&kb)a`T{L_cos@b&>r zaHQpz>g8x+lPBQm-PjW&mEAT{?)Cl)ENp+qg&b`y!FzFn-VW@g^YJ*pGa$^exm#N_ zr|nd->L3V<%B(%YNu|qy0m8z1M(G-gtPFKpgpVHdecpEYn&OY=9RKO17L8<^=1-rP z&I)8*s3EI!J)-l_g}$^97iwAcnSAQCj}gwcog{pu4+M>e2w-%&9c9gjG-Mzvx2$?~ zWS~e6gSG=Ezu`s~OV!?tu);EHU86M3l)TLXrd-}Ey2TsDn%7L*=riE#+Jq$xhfKd! z{NL~Ib9bVdkJ8B&Q+$drKtM1x3&GPtvUa)&D%*ETySj;%!}~XBt&^Go7ayfyv}TXL zgFW|@&o$EhYPRL??rCj4SiaU(C5&YA`OV#`+T?`J%_i8R|3C?r-U$bDp#*3H%8oU4 zU|%B`)&Tim`0OY84?@})Vk4quYG##vjI_m9M*rVvAeS+Bn5mRy=vG||?zgS7dKt?oldFJ$E%_Y8SG7Ic4msF)8yi(TTmn-iNK z4Eb(<+iQUK-Eg1(4_6XBMw|4`iU0rrU{Fj{MSGls?(XgY007n1y{x2r|ATw(F#z5% z5XCVm00000000000000000000000000DGK+?lA!NgE9ZK5Z>l7d(Bdu-rj1I_M}0i ztgL(9-o?G7IsaOVQhSR*K|%lj|J!3_TL1t60b)x>L;#2d9Y_EG010qNS#tmYE+YT{ zE+YYWr9XB6000McNliru=LP{201ckhEomyWRKql>8b5yWLyz z`?UND0Eyl$04J|cyWM+Mx4S351cFyr%NuR9E)BC3!p|&)aGs?Qjr~$-M zEq4k4^LEcHfI*oNEdb`2r1>7eS<_j6833_-6EPshE{LL0UBG7WE&u`$h1CGi>g?ZpKJfNA`c3)lkef}bfDP!^Egb-}SP0#LbNc-#eKusIhL>nC;;R(b)T zWhwyZ5(|Lz{BV`E09XJ84g=t~3jh?6ApihM@?%*3WdLY$D&ijlAelTDoF#!s(hZY% z#H7Deh5-KcK=jXt;*B;6-7JN0nWYd8vlPNld(L(^_ zeCEt3F@RKX$n~7di5QltrYxT5%G?5=_}yvFCIL_f^8#R0b>Q%ZVgcYM6COZUF@Ve| z34jZ$O^hKZfP-td0dTMYPPy@L$`6lS0G+sia~-?Exj+E0FBAZ~%b|$(0I)A=7j)`^ z()I}#6f+bAm1Cq{{8R%V7kB_&?SeS(0@ioAQ+074$`pXfUZ4yE^(252$IVB0DFszM zzU<<90aez$06b+m7jj}PKnX6$C^&HeEDAR+(6W#=0NoHP~56->ECFh z=0~!hr4agAdUn2WI_(?OH>fpV2&WUz2XL_DJpdXsu?)57l7Ej^PACb0lddjMrhfac)eMJ^afH*E%F&dYV+ZK{zA_#3EPP^_OAm)v*36ad|yk^K^k z-4;Lz=rsT??d_Cc$_1v{0syo=m>q($WxxRNgU{uAx;SY!Or^af=!H1|`Dx_L41jrB zeIRP?53D^DZ?sXk&QiO+^%37@srCLgwYu@GK?y(}qcR7|6$z882d?Lo%TbG*Hkd^g zH~_gQbD$h01>j=1JvjgZU_y;%uAIA42&s+=U<9DvMDPH(X_9~yC;+M#2wI{bU#%am_!aj;ZhM{0;%+HeavCOU7&Xde%T{3mX9_ zOc4kGS-HDKeqR7!iMWV#QxO^<=Wg_g+pb^$&{GbD0-(T6A>BrFO4<0?*X#$%NJ=8R z05ZE(TMY#ON_>L~0$`q61JUhCYRB`|P~3WdtA3-6nuktnZ!)!x-P+r1&jK)K&7M&* zJDp%z1waR%;D(|_0PY>`(*bPR>2;MO0FfhP;7tx1jF$nB!+&8Q=kXqZtlniY&j7Tw zQLl0?vA_^|_^+qVQK3Ww006gAgt;x?0>I3z;zC!*io0^bo&oI3sGDP-VN8<%G_*bd zV2XhQ0G>?)P)9sq0bTO*4oH~~>?;d6CedgKfVpo#mi_j3Z?*w!TOHGIsQmz#V{UOT zXs!QS^ML{Y8_FYr3=H9E1nv32MjLJPSI9;3@L)g>((&zs!Mh zF>nxb@`Bd8XehBX>VV#OJ~sZKslNpP=AV!HTn$Fv)dmpDJR+J&6)Xb~D*(}!EdyZ8 z5PxZbJLZoIeCPnkamio$23iI%v0QqA|KHjry+9SI>7y-M+K~hI--l=R(@O#~9&EJH zM*rKqVEH^?^wcyx@~RSq9(*do)PIDR@w^FO&2M00UJxG)pfY<1c4q*4!Nc#8mHqEVk6?EO g;CJuZXrtHDAJ6e!YL4qJX#fBK07*qoM6N<$f^3?yq5uE@ literal 0 HcmV?d00001 diff --git a/include/graphics.h b/include/graphics.h index 8ed50b9b1..4a4d86250 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -2745,9 +2745,9 @@ extern const u32 gTrainerPalette_RuinManiac[]; extern const u32 gTrainerPalette_Lady[]; extern const u32 gTrainerPalette_Painter[]; -extern const u8 gFireRedMenuElements_Gfx[]; -extern const u16 gFireRedMenuElements1_Pal[]; -extern const u16 gFireRedMenuElements2_Pal[]; +extern const u8 gMenuInfoElements_Gfx[]; +extern const u16 gMenuInfoElements1_Pal[]; +extern const u16 gMenuInfoElements2_Pal[]; extern const u32 gItemIcon_QuestionMark[]; extern const u32 gItemIconPalette_QuestionMark[]; diff --git a/include/menu.h b/include/menu.h index 4adf467ca..b0dc232fb 100644 --- a/include/menu.h +++ b/include/menu.h @@ -8,6 +8,13 @@ #define MENU_NOTHING_CHOSEN -2 #define MENU_B_PRESSED -1 +#define MENU_INFO_ICON_CAUGHT 0 +#define MENU_INFO_ICON_TYPE (NUMBER_OF_MON_TYPES + 1) +#define MENU_INFO_ICON_POWER (NUMBER_OF_MON_TYPES + 2) +#define MENU_INFO_ICON_ACCURACY (NUMBER_OF_MON_TYPES + 3) +#define MENU_INFO_ICON_PP (NUMBER_OF_MON_TYPES + 4) +#define MENU_INFO_ICON_EFFECT (NUMBER_OF_MON_TYPES + 5) + struct MenuAction { const u8 *text; @@ -31,7 +38,7 @@ s8 Menu2_GetMonSpriteAnchorCoordMinusx20(u16 species, u32 personality, u8 a2); void ListMenu_LoadMonIconPalette(u8 palOffset, u16 speciesId); void ListMenu_DrawMonIconGraphics(u8 windowId, u16 speciesId, u32 personality, u16 x, u16 y); void ListMenuLoadStdPalAt(u8 palOffset, u8 palId); -void BlitMoveInfoIcon(u8 windowId, u8 iconId, u16 x, u16 y); +void BlitMenuInfoIcon(u8 windowId, u8 iconId, u16 x, u16 y); // menu s8 Menu_ProcessInputGridLayout(void); diff --git a/src/graphics.c b/src/graphics.c index f4433f49d..8e606ca3f 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -1137,9 +1137,9 @@ const u32 gGhostFrontPic[] = INCBIN_U32("graphics/pokemon/ghost/front.4bpp.lz"); #include "data/graphics/mail.h" -const u16 gFireRedMenuElements1_Pal[] = INCBIN_U16("graphics/interface/dex_caught_pokeball.gbapal"); -const u16 gFireRedMenuElements2_Pal[] = INCBIN_U16("graphics/interface/pokemon_types.gbapal"); -const u8 gFireRedMenuElements_Gfx[] = INCBIN_U8("graphics/interface/dex_caught_pokeball_and_pokemon_types.4bpp"); +const u16 gMenuInfoElements1_Pal[] = INCBIN_U16("graphics/interface/dex_caught_pokeball.gbapal"); +const u16 gMenuInfoElements2_Pal[] = INCBIN_U16("graphics/interface/pokemon_types.gbapal"); +const u8 gMenuInfoElements_Gfx[] = INCBIN_U8("graphics/interface/menu_info.4bpp"); const u16 gMoveRelearner_Pal[] = INCBIN_U16("graphics/interface/learn_move.gbapal"); const u32 gMoveRelearner_Gfx[] = INCBIN_U32("graphics/interface/learn_move.4bpp.lz"); diff --git a/src/learn_move.c b/src/learn_move.c index 40ab59061..2f7f04b01 100644 --- a/src/learn_move.c +++ b/src/learn_move.c @@ -816,7 +816,7 @@ static void MoveLearnerInitListMenu(void) static void PrintMoveInfo(u16 move) { u8 buffer[50]; - BlitMoveInfoIcon(2, gBattleMoves[move].type + 1, 1, 4); + BlitMenuInfoIcon(2, gBattleMoves[move].type + 1, 1, 4); if (gBattleMoves[move].power < 2) { @@ -844,11 +844,11 @@ static void PrintMoveInfo(u16 move) static void LoadMoveInfoUI(void) { - BlitMoveInfoIcon(0, 19, 1, 4); - BlitMoveInfoIcon(1, 20, 0, 4); - BlitMoveInfoIcon(1, 21, 0, 19); - BlitMoveInfoIcon(0, 22, 1, 19); - BlitMoveInfoIcon(0, 23, 1, 34); + BlitMenuInfoIcon(0, MENU_INFO_ICON_TYPE, 1, 4); + BlitMenuInfoIcon(1, MENU_INFO_ICON_POWER, 0, 4); + BlitMenuInfoIcon(1, MENU_INFO_ICON_ACCURACY, 0, 19); + BlitMenuInfoIcon(0, MENU_INFO_ICON_PP, 1, 19); + BlitMenuInfoIcon(0, MENU_INFO_ICON_EFFECT, 1, 34); PutWindowTilemap(0); PutWindowTilemap(1); PutWindowTilemap(4); diff --git a/src/list_menu.c b/src/list_menu.c index 95f4b323b..d759f6d79 100644 --- a/src/list_menu.c +++ b/src/list_menu.c @@ -49,32 +49,32 @@ static void ListMenuDrawCursor(struct ListMenu *list); static void ListMenuCallSelectionChangedCallback(struct ListMenu *list, u8 onInit); static u8 ListMenuAddCursorObject(struct ListMenu *list, u32 cursorKind); -const struct MoveMenuInfoIcon gMoveMenuInfoIcons[] = -{ - { 12, 12, 0x00 }, // Unused - { 32, 12, 0x20 }, // Normal icon - { 32, 12, 0x64 }, // Fight icon - { 32, 12, 0x60 }, // Flying icon - { 32, 12, 0x80 }, // Poison icon - { 32, 12, 0x48 }, // Ground icon - { 32, 12, 0x44 }, // Rock icon - { 32, 12, 0x6C }, // Bug icon - { 32, 12, 0x68 }, // Ghost icon - { 32, 12, 0x88 }, // Steel icon - { 32, 12, 0xA4 }, // ??? (Mystery) icon - { 32, 12, 0x24 }, // Fire icon - { 32, 12, 0x28 }, // Water icon - { 32, 12, 0x2C }, // Grass icon - { 32, 12, 0x40 }, // Electric icon - { 32, 12, 0x84 }, // Psychic icon - { 32, 12, 0x4C }, // Ice icon - { 32, 12, 0xA0 }, // Dragon icon - { 32, 12, 0x8C }, // Dark icon - { 40, 12, 0xA8 }, // -Type- icon - { 40, 12, 0xC0 }, // -Power- icon - { 40, 12, 0xC8 }, // -Accuracy- icon - { 40, 12, 0xE0 }, // -PP- icon - { 40, 12, 0xE8 }, // -Effect- icon +static const struct MoveMenuInfoIcon sMenuInfoIcons[] = +{ // { width, height, offset } + [MENU_INFO_ICON_CAUGHT] = { 12, 12, 0x00 }, + [TYPE_NORMAL + 1] = { 32, 12, 0x20 }, + [TYPE_FIGHTING + 1] = { 32, 12, 0x64 }, + [TYPE_FLYING + 1] = { 32, 12, 0x60 }, + [TYPE_POISON + 1] = { 32, 12, 0x80 }, + [TYPE_GROUND + 1] = { 32, 12, 0x48 }, + [TYPE_ROCK + 1] = { 32, 12, 0x44 }, + [TYPE_BUG + 1] = { 32, 12, 0x6C }, + [TYPE_GHOST + 1] = { 32, 12, 0x68 }, + [TYPE_STEEL + 1] = { 32, 12, 0x88 }, + [TYPE_MYSTERY + 1] = { 32, 12, 0xA4 }, + [TYPE_FIRE + 1] = { 32, 12, 0x24 }, + [TYPE_WATER + 1] = { 32, 12, 0x28 }, + [TYPE_GRASS + 1] = { 32, 12, 0x2C }, + [TYPE_ELECTRIC + 1] = { 32, 12, 0x40 }, + [TYPE_PSYCHIC + 1] = { 32, 12, 0x84 }, + [TYPE_ICE + 1] = { 32, 12, 0x4C }, + [TYPE_DRAGON + 1] = { 32, 12, 0xA0 }, + [TYPE_DARK + 1] = { 32, 12, 0x8C }, + [MENU_INFO_ICON_TYPE] = { 40, 12, 0xA8 }, + [MENU_INFO_ICON_POWER] = { 40, 12, 0xC0 }, + [MENU_INFO_ICON_ACCURACY] = { 40, 12, 0xC8 }, + [MENU_INFO_ICON_PP] = { 40, 12, 0xE0 }, + [MENU_INFO_ICON_EFFECT] = { 40, 12, 0xE8 }, }; static void ListMenuDummyTask(u8 taskId) @@ -743,16 +743,16 @@ void ListMenuLoadStdPalAt(u8 palOffset, u8 palId) { case 0: default: - palette = gFireRedMenuElements1_Pal; + palette = gMenuInfoElements1_Pal; break; case 1: - palette = gFireRedMenuElements2_Pal; + palette = gMenuInfoElements2_Pal; break; } LoadPalette(palette, palOffset, PLTT_SIZE_4BPP); } -void BlitMoveInfoIcon(u8 windowId, u8 iconId, u16 x, u16 y) +void BlitMenuInfoIcon(u8 windowId, u8 iconId, u16 x, u16 y) { - BlitBitmapRectToWindow(windowId, gFireRedMenuElements_Gfx + gMoveMenuInfoIcons[iconId].offset * 32, 0, 0, 128, 128, x, y, gMoveMenuInfoIcons[iconId].width, gMoveMenuInfoIcons[iconId].height); + BlitBitmapRectToWindow(windowId, &gMenuInfoElements_Gfx[sMenuInfoIcons[iconId].offset * TILE_SIZE_4BPP], 0, 0, 128, 128, x, y, sMenuInfoIcons[iconId].width, sMenuInfoIcons[iconId].height); } diff --git a/src/pokedex_screen.c b/src/pokedex_screen.c index 67d826fa4..01960d240 100644 --- a/src/pokedex_screen.c +++ b/src/pokedex_screen.c @@ -1554,11 +1554,11 @@ static void ItemPrintFunc_OrderedListMenu(u8 windowId, u32 itemId, u8 y) DexScreen_PrintMonDexNo(sPokedexScreenData->numericalOrderWindowId, FONT_SMALL, species, 12, y); if (caught) { - BlitMoveInfoIcon(sPokedexScreenData->numericalOrderWindowId, 0, 0x28, y); + BlitMenuInfoIcon(sPokedexScreenData->numericalOrderWindowId, MENU_INFO_ICON_CAUGHT, 0x28, y); type1 = gSpeciesInfo[species].types[0]; - BlitMoveInfoIcon(sPokedexScreenData->numericalOrderWindowId, type1 + 1, 0x78, y); + BlitMenuInfoIcon(sPokedexScreenData->numericalOrderWindowId, type1 + 1, 0x78, y); if (type1 != gSpeciesInfo[species].types[1]) - BlitMoveInfoIcon(sPokedexScreenData->numericalOrderWindowId, gSpeciesInfo[species].types[1] + 1, 0x98, y); + BlitMenuInfoIcon(sPokedexScreenData->numericalOrderWindowId, gSpeciesInfo[species].types[1] + 1, 0x98, y); } } @@ -3091,9 +3091,9 @@ u8 DexScreen_DrawMonAreaPage(void) if (monIsCaught) { - BlitMoveInfoIcon(sPokedexScreenData->windowIds[12], 1 + gSpeciesInfo[species].types[0], 0, 1); + BlitMenuInfoIcon(sPokedexScreenData->windowIds[12], 1 + gSpeciesInfo[species].types[0], 0, 1); if (gSpeciesInfo[species].types[0] != gSpeciesInfo[species].types[1]) - BlitMoveInfoIcon(sPokedexScreenData->windowIds[12], 1 + gSpeciesInfo[species].types[1], 32, 1); + BlitMenuInfoIcon(sPokedexScreenData->windowIds[12], 1 + gSpeciesInfo[species].types[1], 32, 1); } PutWindowTilemap(sPokedexScreenData->windowIds[12]); CopyWindowToVram(sPokedexScreenData->windowIds[12], COPYWIN_GFX); diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index f4b4af3c3..2ff2483b1 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -2919,11 +2919,11 @@ static void PokeSum_DrawMoveTypeIcons(void) if (sMonSummaryScreen->moveIds[i] == MOVE_NONE) continue; - BlitMoveInfoIcon(sMonSummaryScreen->windowIds[5], sMonSummaryScreen->moveTypes[i] + 1, 3, GetMoveNamePrinterYpos(i)); + BlitMenuInfoIcon(sMonSummaryScreen->windowIds[5], sMonSummaryScreen->moveTypes[i] + 1, 3, GetMoveNamePrinterYpos(i)); } if (sMonSummaryScreen->mode == PSS_MODE_SELECT_MOVE) - BlitMoveInfoIcon(sMonSummaryScreen->windowIds[5], sMonSummaryScreen->moveTypes[4] + 1, 3, GetMoveNamePrinterYpos(4)); + BlitMenuInfoIcon(sMonSummaryScreen->windowIds[5], sMonSummaryScreen->moveTypes[4] + 1, 3, GetMoveNamePrinterYpos(4)); } static void PokeSum_PrintPageHeaderText(u8 curPageIndex) @@ -3362,10 +3362,10 @@ static void PokeSum_PrintMonTypeIcons(void) case PSS_PAGE_INFO: if (!sMonSummaryScreen->isEgg) { - BlitMoveInfoIcon(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], sMonSummaryScreen->monTypes[0] + 1, 47, 35); + BlitMenuInfoIcon(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], sMonSummaryScreen->monTypes[0] + 1, 47, 35); if (sMonSummaryScreen->monTypes[0] != sMonSummaryScreen->monTypes[1]) - BlitMoveInfoIcon(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], sMonSummaryScreen->monTypes[1] + 1, 83, 35); + BlitMenuInfoIcon(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], sMonSummaryScreen->monTypes[1] + 1, 83, 35); } break; case PSS_PAGE_SKILLS: @@ -3374,10 +3374,10 @@ static void PokeSum_PrintMonTypeIcons(void) break; case PSS_PAGE_MOVES_INFO: FillWindowPixelBuffer(sMonSummaryScreen->windowIds[6], 0); - BlitMoveInfoIcon(sMonSummaryScreen->windowIds[6], sMonSummaryScreen->monTypes[0] + 1, 0, 3); + BlitMenuInfoIcon(sMonSummaryScreen->windowIds[6], sMonSummaryScreen->monTypes[0] + 1, 0, 3); if (sMonSummaryScreen->monTypes[0] != sMonSummaryScreen->monTypes[1]) - BlitMoveInfoIcon(sMonSummaryScreen->windowIds[6], sMonSummaryScreen->monTypes[1] + 1, 36, 3); + BlitMenuInfoIcon(sMonSummaryScreen->windowIds[6], sMonSummaryScreen->monTypes[1] + 1, 36, 3); PutWindowTilemap(sMonSummaryScreen->windowIds[6]); break; diff --git a/src/tm_case.c b/src/tm_case.c index d2e81374b..dd5adb345 100644 --- a/src/tm_case.c +++ b/src/tm_case.c @@ -1529,10 +1529,10 @@ static void PrintTitle(void) static void DrawMoveInfoLabels(void) { - BlitMoveInfoIcon(WIN_MOVE_INFO_LABELS, 19, 0, 0); - BlitMoveInfoIcon(WIN_MOVE_INFO_LABELS, 20, 0, 12); - BlitMoveInfoIcon(WIN_MOVE_INFO_LABELS, 21, 0, 24); - BlitMoveInfoIcon(WIN_MOVE_INFO_LABELS, 22, 0, 36); + BlitMenuInfoIcon(WIN_MOVE_INFO_LABELS, MENU_INFO_ICON_TYPE, 0, 0); + BlitMenuInfoIcon(WIN_MOVE_INFO_LABELS, MENU_INFO_ICON_POWER, 0, 12); + BlitMenuInfoIcon(WIN_MOVE_INFO_LABELS, MENU_INFO_ICON_ACCURACY, 0, 24); + BlitMenuInfoIcon(WIN_MOVE_INFO_LABELS, MENU_INFO_ICON_PP, 0, 36); CopyWindowToVram(WIN_MOVE_INFO_LABELS, COPYWIN_GFX); } @@ -1553,7 +1553,7 @@ static void PrintMoveInfo(u16 itemId) { // Draw type icon move = ItemIdToBattleMoveId(itemId); - BlitMoveInfoIcon(WIN_MOVE_INFO, gBattleMoves[move].type + 1, 0, 0); + BlitMenuInfoIcon(WIN_MOVE_INFO, gBattleMoves[move].type + 1, 0, 0); // Print power if (gBattleMoves[move].power < 2) diff --git a/src/union_room.c b/src/union_room.c index c5e77b1e5..172c41f33 100644 --- a/src/union_room.c +++ b/src/union_room.c @@ -3934,7 +3934,7 @@ static void TradeBoardPrintItemInfo(u8 windowId, u8 y, struct RfuGameData * data } else { - BlitMoveInfoIcon(windowId, type + 1, 68, y); + BlitMenuInfoIcon(windowId, type + 1, 68, y); PrintUnionRoomText(windowId, FONT_NORMAL, gSpeciesNames[species], 118, y, colorIdx); ConvertIntToDecimalStringN(levelStr, level, STR_CONV_MODE_LEFT_ALIGN, 3); PrintUnionRoomText(windowId, FONT_NORMAL, levelStr, GetStringRightAlignXOffset(2, levelStr, 218), y, colorIdx); From 22fd5541e32e0b0e23b205e177652ad2eca6cb17 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Fri, 2 Jun 2023 12:33:06 -0400 Subject: [PATCH 6/8] Correct colors in summary_screen/bg.png --- graphics/summary_screen/bg.pal | 115 --------------------------------- graphics/summary_screen/bg.png | Bin 3059 -> 17264 bytes 2 files changed, 115 deletions(-) delete mode 100644 graphics/summary_screen/bg.pal diff --git a/graphics/summary_screen/bg.pal b/graphics/summary_screen/bg.pal deleted file mode 100644 index a574f8c50..000000000 --- a/graphics/summary_screen/bg.pal +++ /dev/null @@ -1,115 +0,0 @@ -JASC-PAL -0100 -112 -255 0 255 -0 123 197 -230 222 156 -230 205 255 -0 74 148 -123 156 156 -197 189 115 -106 197 205 -205 172 238 -180 139 213 -205 172 238 -180 139 213 -255 180 0 -123 131 148 -255 255 255 -98 106 123 -255 0 255 -255 255 255 -230 230 238 -205 172 238 -98 106 123 -180 139 213 -230 205 255 -205 172 238 -255 0 255 -255 0 255 -255 255 255 -213 213 213 -222 222 222 -230 230 230 -238 238 238 -246 246 246 -255 0 255 -255 172 148 -255 213 172 -255 238 213 -230 139 106 -255 246 238 -255 246 238 -238 238 197 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -123 131 148 -255 255 255 -98 106 123 -255 0 255 -255 213 90 -255 238 123 -255 246 197 -246 189 82 -255 255 222 -255 255 222 -246 238 180 -255 255 164 -123 131 148 -98 106 123 -255 213 82 -255 180 65 -123 131 148 -255 255 255 -98 106 123 -255 0 255 -156 238 213 -172 246 222 -230 255 255 -106 197 156 -246 255 255 -246 255 255 -205 238 238 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -123 131 148 -255 255 255 -98 106 123 -255 0 255 -255 255 255 -230 230 238 -106 230 230 -98 106 123 -90 213 213 -230 205 255 -205 172 238 -255 0 255 -255 0 255 -255 255 255 -213 213 213 -222 222 222 -230 230 230 -246 246 246 -246 246 246 -255 0 255 -0 123 197 -230 222 156 -230 205 255 -0 74 148 -123 156 156 -197 189 115 -106 197 205 -106 230 230 -90 213 213 -205 172 238 -180 139 213 -255 180 0 -123 131 148 -255 255 255 -98 106 123 diff --git a/graphics/summary_screen/bg.png b/graphics/summary_screen/bg.png index df2f6c98f6d4a153a9f36a45ed0cb88f8fe09b5c..c7285d2bda7f03df4d4e4c36c047ebfb3ba066a6 100644 GIT binary patch literal 17264 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 XvJ&bO^0eOD00000NkvXXu0mjf!g62d delta 3019 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 N002ovPDHLkV1hHiRD%Ej From cf089fedd01f3101f5834e0bffb6c0e344033141 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Fri, 2 Jun 2023 14:34:36 -0400 Subject: [PATCH 7/8] Correct colors in pokemon_storage/menu.png --- graphics/pokemon_storage/menu.png | Bin 1230 -> 10631 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/graphics/pokemon_storage/menu.png b/graphics/pokemon_storage/menu.png index b4f09713382d6328cbcc8f4f366bb19480f412c0..77fdf9f1fecd02147225ed8c129443c2ee282391 100644 GIT binary patch literal 10631 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 delta 1178 zcmV;L1ZDe&Q_cyH7!d>m0002YtKcC3001yhOjJdap(HSW(2v@*000D8NklY)a6=Gu^>DbXMvYd!zd+KYRn$VDoumZ0(eSD9UY*`a+4n~$qVK%`bex~{( zzy|-UxaJLiz--)pK){R2Kl|VQswBP$|=Ac(C1@9Ge;0x;JAs{=IR0IkFULy(mqV}L^9 zWx7YNG~EjYkPKAR3W37)8LkdsPf&Myxd#z2N-xuYl%xop2)J0I2(r0YqYnc15^$*l zWC#VJ4S*sL$s8?r&*M1T~5v+WI8mnqcpXbfT51gP0PwPXaKDS%A|Y}p$^ z1sL>K1S0@9iB*!hi@l>_d7c@>~G9UzOu2oN-f0mYSsUJu}<4#TZ z?_19wt3}Q3Pqpm4>OA+a%Xfz4&BOKQ${rA~K?A@>v-YFhx_Xlq_WtYDAJq>v6#V3W z)OON3ZLRAX@NoTS^+OE>P6LoMY?1%j2?1g8pt#SsAF<8esAvrHNSP(1*)RR}Dm62OKOWI6zR zv8h6cxdhMw1>aSGTZ(JohJNVRAsi)tU}z1hVmoy_*SnRU+d2yooGc=OEL0`&wxvJ= z=!H}OqBu(8D5lz8c-yCdylzzDUBmhnXj@j_jorP_r$9TM8oRM`9`q;x=?fan7MKUT z;f9W5{6C;i0Rngdz#C2{slo*`p2%pM9>Wx3nh}60lr`|bnCWRX z;orC#V0f`!wCmk8rvfA$L%`jLX#m=>kBgJ1-MdZuy#{b5IKDhG&hVsf01_HwBhL;R z$qwFW0(LA(C`&ls;St#Y!0cFkHc?cJA_IW#Vs%8aT^B&(lF|==5C9;eBa20324Dyj zLx2d9&Kf`nF@^vNB5n?W4u-&nLYT4!d?&LIG2Q`yURdChGlg05a#2=?NFxx&QzG07*qoM6N<$f__>MG5`Po From 8ef8535fc534b626f573d8c1f652ea0f4afe763b Mon Sep 17 00:00:00 2001 From: GriffinR Date: Fri, 2 Jun 2023 15:00:50 -0400 Subject: [PATCH 8/8] Colorize battle_interface/healthbox_elements.png --- .../battle_interface/healthbox_elements.png | Bin 1226 -> 5416 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/graphics/battle_interface/healthbox_elements.png b/graphics/battle_interface/healthbox_elements.png index aadcc8554e65c1f27a301cbb5cb7c922edf88077..5e22fb75e2315b65a5e1d7af19c5765cfebd2dff 100644 GIT binary patch literal 5416 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 literal 1226 zcmV;*1U37KP)i}00Cl4M??UK1szBL00Ztx zL_t(|oV}L4Zrnx`g$FS7B3CI~@CWcZN+Vm10=J9A3Q`&ZveFYs4`9I97f6v8aIv*r zZN~trrrJQ|G&G=c3I?ht=L~0N`M0711R3kD4#{usz2|aCS*ho&7pud|11DEEw^z5f zE16gxSP{6ny1c;pir6wBwh%3FyM9!N_3S~I{OpA)OaCZpI=I}yyVE)O~Zh z1Hv*OtYthPEaPDw_z&lBvFr!dF>h9&UL3vrT^;e?>NjxJgW7LuHA@7*m|+PI?3)ZgXcF0sZ*tb=p$o^hUA*VHz<->DgpzM- zv2{^f)i!5L$Evq&Yg-g`T|{7Kg4Hg-9LoFWTtWuPTiX^TtkkuN{>{Eb0IWrcS_S{9 z$vBI*0DP0PHf`r%N~_{q@+_9xiY;u=wG^tb$+Jz`CT%Bx!cG8!Pj6h6 zx{*?FUIovN4SDU7Mx)5k2TC^p8pVtv-nckFoS=Cgyb7LsC0xqTu*m>~CXvmxP5SfC zusOUSKYUO=;$NJy^^AtvGQ9Yz2e|(IC-AWgL`z-ZR07*qoM6N<$f)(mAh5!Hn