From febf864bf696c76bd5165a847d9d941032313bca Mon Sep 17 00:00:00 2001
From: GriffinR <griffin.g.richards@gmail.com>
Date: Thu, 1 Jun 2023 13:39:17 -0400
Subject: [PATCH] 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{<kc$1&J#ps3l^b^+JjuS3_4~-^`fN4uhu)Zj2Jy$uS<d9vEN60;x8_Xl
z^49w6{#&p9ZFnjnAS9GP=4OItzJDR2qM)RdLgr>gG~8rFM?*_1jm*t%a4qF1SMAud
Tmz~T_*K|zF1VgPfFnaR^6lN2U

literal 300
zcmYk2Jx;?w5QV?BN7^l1*c}oSPDM+Lw(${i1diYY1(PU|tdIanq=<h=(r^SWfP^>+
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*b<s
z^|K$_u9?tR3>ZjXoc?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)<h;3K|Lk000e1NJLTq004jh003YF0{{R3Csb#80000mP)t-si(+%;
z_V(WH|JCO9#ntBa&6K31q+()o_SK8D&6H}S-ddc^Idh!<_PziA|AW2emK7x7000F>
zNkl<ZScRpSzi%5i6vwq?$aIjAAxoD20|tc-9V`SEI(pOS!AnL1U3@@Ow5zPYpw3ow
z5w0kdIU2O920D4v5XkV*;WWsT3z&Uh@{#vQ-sw*6i>c!=;+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(xf20dtq<N7
z#nmAM-UlKIIfucgaudOdpF;z{c|ZhM@<yNxO$|n)QS~|)ty`=o7GBmzZ!+IN??sCV
z0yT10jo(2a9$gR|jk*Yk!6Jf<sZYqJR6g-@HZ3MIZmJ0SqrfbHtrxRNQA~>26a|&*
z0wSi#6AZ%shT!X<L4a5S0qg6O;AkWTZhoDjm~PjT+4apQ^D2C>alXKZ6te=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<AzTq>{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*!-GDH<vZ5ExLVA2pk8h0tum5_1V}A-L?wAV5DI@~bx$rW9(_s7>0qlQH
zfc(&ui9CLd0Iz-C4$@Q($4>=X*8=Z}T?K9$2vnm$>vGQXTVpF8f}Uqpo9!errF7H4
z(_A#&bwmg}#%-A}yw9b;Peme7#BCC}U<EubiKzEujX>O%+S~}>Ue#MgUtUG^eTKVY
zAOOTzz+>0gRYdRzFGm88)!8slgm71s0%jwy0yccEjr$vcTVc2>3W2$g_3F<maU6jQ
zT~FF;Dnh`=S_(J<-9f;NZXB5s%<BXei^b=Jz|<oG`r?xMFJJ)xUSon-fZKd9gDDU|
zR|2h{7Ae8!&IIIwr(zxxyoML|5sb+!!4e+OF@dr5`ffZvryu${{oI}3o%6dj+N(}v
zCe{e7@2K<IbhZD+YrL}n{ybu5zic811;&<uTFyfsP$c#djL$I>Grl44Q}90ccd_h5
zP)$J+6o^8a2Z=!CMDGKi2Rh9IC$QJVTBs)&x0qN9^-<u<m_HzKTbWnq%+pfr$fzd*
z_A+MAXo|VQZDm&p44nY^aQ=l#N^tLQrsjkO!9fD{W_0XNNDwGt?F0kwf{i0MNWfgt
zPpc#Pa02gwuj*w4{%Y9YOVAibLvUha04JcWNg(MA^S`c;3;KHmp6c*n8y5t=CLJtr
z<OupN6u5Wyb5$?!OBaIo;-ZGOUDbd1u?xYOxGBa0`Lade8z$%r0lA#>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)<h;3K|Lk000e1NJLTq004jh002+~0{{R3BQ9Xq0000mP)t-si(+&C
z|NrLy-lU|YdwY9gVsj}uK{;xRL5sz-=A4x7gM;34Qmjg9z5mV4%>V!Zn9;Bc000AM
zNkl<ZScTP>yKdVs6o$2A4zzOAmU^<iwQC=sL7*iF(AVhF-DnXM?Us1bSb4HX>kZ_*
z0--l3GI|l%b9g<ZOj)v86#XTdy7ANb$s;mJ5>N_)D$n!fvIOCI84)~`ztzv^c1e<f
zBw&$c6$oz>$Vf}93U!vI4DKP|9n_hY2e``!fWemH4+B!ca4+E=KEKGE5^CXAhi)Q(
zO#%wo7)Aj1@cDV_<N@XsfGu@}oN|wj0>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{cg<Ma3(Duqqd*%UEK?l5vB@zJcveSSY3&4zs<pIpAxB49CN@{@_3(y0-i8Mb4
z_^!T*Xeuw9g`8U07z;WTqJV?Rbp%}Hc@z+{P@7x_0JP7;d?@r+-2t3Zp1(*LXet+6
z^-*;!oKmj+9L!X<n@KaWkA?sqsvf`)3->zo+RTM=<yXgp0CgW=h=oI+g-HN79c@7l
zqs{}gG6?XQD`75RP9#)AEEoXVz?_%_c&Gxv7z^nCzSMu(T?(i}z!(cF&?hJt15kK;
zv4x8PJZv=9!rui<w(x)S0sb-mZ~LGwx3<PqUeR<OV&PEjY)zKDF@P!#7-nH38=(cV
zW)26qg=K4Dqb#_kZD;L_0=UI>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}V<DQqmt++jPM7=%B$0s%6prv_|
z_lRHr5K_<x_(&6A5~kEgVPOi3I30A-MK?Y4(nmk*Y_Q1|)v{+^a(X2$ENLg0WQu8K
zm}QP6XPk4vrLtdq=kz0O6rDmJ=^`qkR8c_8bB#37ObaJuY>Zl$GS6<MjdqS?j`ebP
zfI;Qb`p=em_{KvF|C5fb@nA<7Rd$SV=2=j`*ZuAyOG+-YA}>8D>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<<tkvC8><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<xb+UIkdXGmb+;O({j?8;L
z@Stx0`mNv6a`r2kZ^ZxFxn(a+`Chjr=;tQ4xD9t`@SGR)y=2r&BK^fow!lGTm|^Ah
zAFmg5wqk=0$pr`K)_q22j9xxsblK?8=)BQx1f2~_Dhl%397?CzR)bNfUI%;sw1iNH
Hv@iM(w!~th

diff --git a/graphics/trainer_card/front_hoenn.bin b/graphics/trainer_card/front_hoenn.bin
deleted file mode 100644
index 0f45caec63f931eb37b47e76f3ec376183f5cc84..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 532
zcmXw$Nl#Nz0ENF>?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(K<Ni9f3NxJH
zEa#eSJ5uSMQd4UBl!~rSYkGB~UW3bA;VRb@vt0M>2`1WZokB^KRav_wO})dp1@qkI
z4tI&&<GydtbHV-PW3wu!ayr|@W}5X$PBPcU4Ysr6_iSu#SS8Ks(40;*>lfh?bru+N
zu|aWWO+{2>REH_duf;jN0lHE2u#tt{9}feu{5{$`AP4>gPT<s>rq!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=<O_bI#&BC#TSt41tGMiAY4)7oG%{DVIhX#9~Ui$P6Vm
zWC+iA&N?sPC9inR8+gk*HjwLxQTB7h+S3z-lFV3UQ}*CJANa^8_{<l+@(uZ&A8cCH
zqwG7z$;4PD%ke+ERawi7Pz8%I4k6;f9+4wYUXJIalO1W9Q#hIvOeA(kl$ot`epX}|
zziq@c#Y9-5ZE8%`!N!(#DJ^QDsnX(fhBKVyTzvO%)Eb__H1YArWfL<K4zO)l<|3E4
z9K~j`HN2=6)zX40Y%OW_>R!-+8?11XTZ&a~hvq!9u@lf}Dqs29X=;L$a}U<I&jTJ(
ze8l6>T;Zy-6JqMhR<^E3m|7Ifae?j-cR0YozpKUWgsNCuV_jX2f@^S{fG12ln8aJ&
zR(X|obdJW_b_pr}rB_8_<ySH~P$n_I(?ANlU|cots)gMv=e0YhWkYFF-xp6kyi_H^
G5&r@3!EpKj

diff --git a/graphics/trainer_card/front_link.bin b/graphics/trainer_card/front_link.bin
index ef8e65b27722d39e0251269ba4233840e61d9178..3169533c0542e6dee44d0721343f3876705aa698 100644
GIT binary patch
literal 1200
zcmbW$M^D2r7=Ynd#f2bosno(bGzD>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%C<Oo-|w9-J@x=y<2riV)co2J81uy-$g^mFbPTAR5O
zOlqfe*|u0b@f6elWN6zh><qKo&N0shoBDmtbGO*ma)(`i(zCYaxqDjfb0Xy_XIxp&
zz1Q|Z%155Ks95vdcWpnU{gg7aHeV=Q^Hs4PS#rkm<mDQ5E|>NH1(Q{(+9_{m16i$e
eLfM2<plGNh?*~UoUR6a=5Q!#;Idu_=N%;o`;-^;t

literal 396
zcmXAlJ5N(#7{`APyoE!G2~CO&Kysi3LRcyU%HaWdD|qErZUVYgf^r?oKv?|<egs58
zU;>N^E;>4PaX%m79rytB<gCBse{H%n)I)+gCr<tf2?J@GDL;%svq>AWbTLc-BPgSc
z!DGf*WexL&w{-h*Lg6%&Z*-Zgue{(Tub6^qW|(CT*<za=cCDs=@H3QOzIM>&(GZ7t
zrqF?QR-0t1C7k$@;}QLM1AHK-8G1t}N0Q4AGDLoq4PVL{NiBN?oByOOt~Zn?>`i<O
z%G%@lLYc%qwS&)iPLch2cNm#2uxNvpC6@iv*O*Mcw!sP|9=xM{oy`~?SuK1fdCV8y
zm-N3otjML+E0Wg)ch%fJCuR9w(k!iKoJX%+Ai2b!qMT)tPAmE1m{X_!oKz0ZO_Qd)
dn;~wa0l!PNMY+Y?m{cRwjCi&2{+j4p?g6DhX4(J%

diff --git a/graphics/trainer_card/gold.pal b/graphics/trainer_card/gold.pal
index ebd175e97..79027f0d8 100644
--- a/graphics/trainer_card/gold.pal
+++ b/graphics/trainer_card/gold.pal
@@ -1,19 +1,51 @@
 JASC-PAL
 0100
-16
+48
 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
+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
-189 148 16
-246 197 0
diff --git a/graphics/trainer_card/fr_1stars_pals.pal b/graphics/trainer_card/green.pal
similarity index 100%
rename from graphics/trainer_card/fr_1stars_pals.pal
rename to graphics/trainer_card/green.pal
diff --git a/graphics/trainer_card/rse/back.bin b/graphics/trainer_card/rse/back.bin
new file mode 100644
index 0000000000000000000000000000000000000000..3ef599ce51dd9a99c50770d014971f4db66ae10e
GIT binary patch
literal 1200
zcmeIwI}U&#5Jl0enSz1^LE#dNwaNxug1^11C^Z>u;nX*iyZ|0+^t^y0Fc%2oq-A6>
zdZV<lUC?{mgR{U9@9qpVYWvsrbZV)sck{cat?JJCfA(zU%*s|^6=%U4i=MyBKkovN
COLT1j

literal 0
HcmV?d00001

diff --git a/graphics/trainer_card/em_badges.png b/graphics/trainer_card/rse/badges.png
similarity index 100%
rename from graphics/trainer_card/em_badges.png
rename to graphics/trainer_card/rse/badges.png
diff --git a/graphics/trainer_card/rse/bg.bin b/graphics/trainer_card/rse/bg.bin
new file mode 100644
index 000000000..4e58fafc6
--- /dev/null
+++ b/graphics/trainer_card/rse/bg.bin
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/graphics/trainer_card/em_1stars_pals.pal b/graphics/trainer_card/rse/bronze.pal
similarity index 100%
rename from graphics/trainer_card/em_1stars_pals.pal
rename to graphics/trainer_card/rse/bronze.pal
diff --git a/graphics/trainer_card/em_2stars_pals.pal b/graphics/trainer_card/rse/copper.pal
similarity index 100%
rename from graphics/trainer_card/em_2stars_pals.pal
rename to graphics/trainer_card/rse/copper.pal
diff --git a/graphics/trainer_card/em_female_bg.pal b/graphics/trainer_card/rse/female_bg.pal
similarity index 100%
rename from graphics/trainer_card/em_female_bg.pal
rename to graphics/trainer_card/rse/female_bg.pal
diff --git a/graphics/trainer_card/rse/front.bin b/graphics/trainer_card/rse/front.bin
new file mode 100644
index 0000000000000000000000000000000000000000..e955b0ed977d85836f284da7531fd309cb211442
GIT binary patch
literal 1200
zcmbu-=}#I#7{~E1WYUi90BL|83cVDMO2Jw|XvuEt{lXA$`%>-svbE<+&mQ{5-iQBe
zXGfL}q#D8fB~Ru_<}>qTccF-qji)G}K%T)Sk{1OLB*v~-W1S5)*<zdbeBdLW*kKo;
z(@Gm1X61E$Vj^hlzS!e4U--&5zVm~h{Ngu%*f%?G(91y8)Y=d?n@Gsq8zse6u5q2f
zkqHwaBEsTeSF~bt^l^*+BV>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(^%&LsGY0IV<XM(3Z<1$w)>A$G}
z37Iq#ds8P>!m>FQdB9uVafiGAwcaUV8Ichc*3QepH;U=APH`GZ3uid1yW_<FpS`_t
w5pSs0SasgB>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;ADR<U}
zX{LqNJkpErYighHYHwKwWq-t)B%o!G5Frs1f`HBX>86KX`smN;U6-xn+9pVn6bWtP
zHXCM~2_~6hI>)wU>y%8%F=^cKn9_UoJ+q$$7FlAM6;@fZ`2hyaDz05ZCS_73l<sS@
zVK&)fn;mx9W8Y?Hm^G__wm}(^Ar;g%V6%RP7-pRfDygzb>!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)S9<a`M5332UC
zD*pff|Fi%1mMmFPU0t1&RIF*~XqnaR*nM=%vpG}VH8<ZY4qD@twfFzovuA;thyht!
zu4+~<fv5x;2r~cKJBazX*l_b9?zwvP>Xt2AfbRL<ZF$d<11Jl0&;P4Q@3vSTtv))%
zYYwvdZ$}x<E@1$Y$OvNl-YEkAuYy7X2!L#$f)xGsTMP`$y`C<PAsLNVXC_WstRT?p
zyJ@B1#kt&X<kIV&|JxopH7`T1w_{?&?<}__jhdJ3x@SscU%C}-eZK1Wn#Ln<otMs2
zdG~_t(Z}7^nhZAAcBxh}^ly~gDYkXzp}Wr+SIoE8;D2!JIzwBd`$K<bSGNhgEC>GD
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#&XhYKoXYV3wcFRHd<?pRi5^8_OBg&^^0qgz&Qg8P
zP;ov#;1z@0T;cqP33Z=+xqY6+7BD1iKEo)%Vr9kdbt-bgYX!y=r5s;x*)%NQE5scj
zaq7>T@}+r<^LVY84tzda|2Rob;JZ4*SFs1?-x+?|EI7lOe{iCu!v2k6?hL7XYmMAa
zGFNin*(kzzmMJqa!|<Kq8ipD7KX5l#z25$*;VQ$9xWt1@0lT8kGIzEviki$W!|+}_
zLRRCtbBOW6pj^j@HGv$NoUPv0Zyc}9`F-we6+^@WaYi351?zPi59oPcR^Rej$|&3M
zm&E#~4_#Vb|E^+C-o3V7{DBxZ<A;9-7qM=-&iuaV;xQqH*J@j&7F=VBkmr$WC_A|G
zcWTlE^=^jhtvq&Ks*l@z*VI^w>fTsg`QyYaK_~n6+P{g>Ki*U_7+97u&q-r!k=b6N
z`0wNEpC$}nYRnHriamJz^P^<||AVO6(F$^hHTXBEE@!Oq-Dn|OP<Noz`P1^5<*f`k
ztk2tDGq~;My>N=@+q}<*QyG#u7ffZfec64gpLxTNKgV@{SR4qETCtV&zy5)zVljLL
zJ6Y2iKgjQ1&8WBiflh<!^XR4LR_-{z^vPx&iN{~3uYVoAGmJs(RW-x8EeQh58(DwF
zZDMTLX84g|{sxD;vox=5VZLCt{Ci2!w#^PV=WS;F^wEc*?U)yv%gtlABz|p```vbn
z?MLNb9oIC?@~&UH+;QFOSYF)uVchV0eZ_vc>9=DZp7Z-+8S-*b=B0J>pRgJqSjM{k
z-BGa*8h=j97Qg>DWxs|=fpX0qMh7Q`|2LUyesg>gJYaINdh+dVV1iO?6Lj6+<YrN%
zG~=__fg|??`2-JC3055rd?fJoxbBO|k<&w%8(F?>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
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
TQtz$$`^|<23xY0uB+mH@Ycl5}

literal 0
HcmV?d00001

diff --git a/graphics/trainer_card/unused.pal b/graphics/trainer_card/unused.pal
new file mode 100644
index 000000000..25a3ac1d2
--- /dev/null
+++ b/graphics/trainer_card/unused.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 255 255
+255 255 255
+98 98 98
+213 213 205
+230 8 8
+255 189 115
+32 156 8
+148 246 148
+49 82 205
+164 197 246
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/include/graphics.h b/include/graphics.h
index fe87445b4..8ed50b9b1 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -4464,9 +4464,9 @@ extern const u32 gBuyMenuFrame_Pal[];
 extern const u16 gPPTextPalette[];
 
 // trainer card
-extern const u16 gKantoTrainerCard_Pal[];
+extern const u16 gKantoTrainerCardBlue_Pal[];
 extern const u32 gKantoTrainerCard_Gfx[];
-extern const u16 gHoennTrainerCard_Pal[];
+extern const u16 gHoennTrainerCardGreen_Pal[];
 extern const u32 gHoennTrainerCard_Gfx[];
 
 // battle_interface
diff --git a/src/graphics.c b/src/graphics.c
index 0f19fe0fa..5e9b02303 100644
--- a/src/graphics.c
+++ b/src/graphics.c
@@ -1178,10 +1178,10 @@ const u32 gNamingScreenUnderscore_Gfx[]     = INCBIN_U32("graphics/naming_screen
 
 const u8 gTMCaseHM_Gfx[] = INCBIN_U8("graphics/tm_case/hm.4bpp");
 
-const u16 gKantoTrainerCard_Pal[] = INCBIN_U16("graphics/trainer_card/0star.gbapal");
-const u32 gKantoTrainerCard_Gfx[] = INCBIN_U32("graphics/trainer_card/card.4bpp.lz");
-const u16 gHoennTrainerCard_Pal[] = INCBIN_U16("graphics/trainer_card/0star_em.gbapal");
-const u32 gHoennTrainerCard_Gfx[] = INCBIN_U32("graphics/trainer_card/card_em.4bpp.lz");
+const u16 gKantoTrainerCardBlue_Pal[] = INCBIN_U16("graphics/trainer_card/blue.gbapal");
+const u32 gKantoTrainerCard_Gfx[] = INCBIN_U32("graphics/trainer_card/tiles.4bpp.lz");
+const u16 gHoennTrainerCardGreen_Pal[] = INCBIN_U16("graphics/trainer_card/rse/green.gbapal");
+const u32 gHoennTrainerCard_Gfx[] = INCBIN_U32("graphics/trainer_card/rse/tiles.4bpp.lz");
 
 const u16 gEasyChatWindow_Pal[] = INCBIN_U16("graphics/easy_chat/window.gbapal");
 const u32 gEasyChatWindow_Gfx[] = INCBIN_U32("graphics/easy_chat/window.4bpp.lz");
diff --git a/src/trainer_card.c b/src/trainer_card.c
index 567dc3085..ab959d6c4 100644
--- a/src/trainer_card.c
+++ b/src/trainer_card.c
@@ -151,35 +151,35 @@ static void InitTrainerCardData(void);
 static u8 GetCardType(void);
 static void CreateTrainerCardTrainerPic(void);
 
-// Data
-static const u32 sTrainerCardStickers_Gfx[] = INCBIN_U32("graphics/trainer_card/stickers.4bpp.lz");
-static const u32 sHoennTrainerCardFront_Tilemap[] = INCBIN_U32("graphics/trainer_card/front_hoenn.bin");
-static const u32 sKantoTrainerCardFront_Tilemap[] = INCBIN_U32("graphics/trainer_card/front.bin");
-static const u32 sHoennTrainerCardBack_Tilemap[] = INCBIN_U32("graphics/trainer_card/back_hoenn.bin");
-static const u32 sKantoTrainerCardBack_Tilemap[] = INCBIN_U32("graphics/trainer_card/back.bin");
-static const u32 sHoennTrainerCardFrontLink_Tilemap[] = INCBIN_U32("graphics/trainer_card/front_hoenn_link.bin");
-static const u32 sKantoTrainerCardFrontLink_Tilemap[] = INCBIN_U32("graphics/trainer_card/front_link.bin");
-static const u32 sHoennTrainerCardBg_Tilemap[] = INCBIN_U32("graphics/trainer_card/bg_hoenn.bin");
-static const u32 sKantoTrainerCardBg_Tilemap[] = INCBIN_U32("graphics/trainer_card/bg.bin");
-static const u16 sHoennTrainerCard1Stars_Pals[] = INCBIN_U16("graphics/trainer_card/em_1stars_pals.gbapal");
-static const u16 sKantoTrainerCard1Stars_Pals[] = INCBIN_U16("graphics/trainer_card/fr_1stars_pals.gbapal");
-static const u16 sHoennTrainerCard2Stars_Pals[] = INCBIN_U16("graphics/trainer_card/em_2stars_pals.gbapal");
-static const u16 sKantoTrainerCard2Stars_Pals[] = INCBIN_U16("graphics/trainer_card/fr_2stars_pals.gbapal");
-static const u16 sHoennTrainerCard3Stars_Pals[] = INCBIN_U16("graphics/trainer_card/em_3stars_pals.gbapal");
-static const u16 sKantoTrainerCard3Stars_Pals[] = INCBIN_U16("graphics/trainer_card/fr_3stars_pals.gbapal");
-static const u16 sHoennTrainerCard4Stars_Pals[] = INCBIN_U16("graphics/trainer_card/em_4stars_pals.gbapal");
-static const u16 sKantoTrainerCard4Stars_Pals[] = INCBIN_U16("graphics/trainer_card/fr_4stars_pals.gbapal");
-static const u16 sHoennTrainerCardFemaleBackground_Pal[] = INCBIN_U16("graphics/trainer_card/em_female_bg.gbapal");
-static const u16 sKantoTrainerCardFemaleBackground_Pal[] = INCBIN_U16("graphics/trainer_card/fr_female_bg.gbapal");
-static const u16 sHoennTrainerCardBadges_Pal[] = INCBIN_U16("graphics/trainer_card/em_badges.gbapal");
-static const u16 sKantoTrainerCardBadges_Pal[] = INCBIN_U16("graphics/trainer_card/fr_badges.gbapal");
-static const u16 sTrainerCardGold_Pal[] = INCBIN_U16("graphics/trainer_card/gold.gbapal");
-static const u16 sTrainerCardStickerPal1[] = INCBIN_U16("graphics/trainer_card/sticker1.gbapal");
-static const u16 sTrainerCardStickerPal2[] = INCBIN_U16("graphics/trainer_card/sticker2.gbapal");
-static const u16 sTrainerCardStickerPal3[] = INCBIN_U16("graphics/trainer_card/sticker3.gbapal");
-static const u16 sTrainerCardStickerPal4[] = INCBIN_U16("graphics/trainer_card/sticker4.gbapal");
-static const u32 sHoennTrainerCardBadges_Gfx[] = INCBIN_U32("graphics/trainer_card/em_badges.4bpp.lz");
-static const u32 sKantoTrainerCardBadges_Gfx[] = INCBIN_U32("graphics/trainer_card/badges.4bpp.lz");
+static const u32 sTrainerCardStickers_Gfx[]           = INCBIN_U32("graphics/trainer_card/stickers.4bpp.lz");
+static const u32 sHoennTrainerCardFront_Tilemap[]     = INCBIN_U32("graphics/trainer_card/rse/front.bin.lz");
+static const u32 sKantoTrainerCardFront_Tilemap[]     = INCBIN_U32("graphics/trainer_card/front.bin.lz");
+static const u32 sHoennTrainerCardBack_Tilemap[]      = INCBIN_U32("graphics/trainer_card/rse/back.bin.lz");
+static const u32 sKantoTrainerCardBack_Tilemap[]      = INCBIN_U32("graphics/trainer_card/back.bin.lz");
+static const u32 sHoennTrainerCardFrontLink_Tilemap[] = INCBIN_U32("graphics/trainer_card/rse/front_link.bin.lz");
+static const u32 sKantoTrainerCardFrontLink_Tilemap[] = INCBIN_U32("graphics/trainer_card/front_link.bin.lz");
+static const u32 sHoennTrainerCardBg_Tilemap[]        = INCBIN_U32("graphics/trainer_card/rse/bg.bin.lz");
+static const u32 sKantoTrainerCardBg_Tilemap[]        = INCBIN_U32("graphics/trainer_card/bg.bin.lz");
+static const u16 sUnused_Pal[]                        = INCBIN_U16("graphics/trainer_card/unused.gbapal");
+static const u16 sHoennTrainerCardBronze_Pal[]        = INCBIN_U16("graphics/trainer_card/rse/bronze.gbapal");
+static const u16 sKantoTrainerCardGreen_Pal[]         = INCBIN_U16("graphics/trainer_card/green.gbapal");
+static const u16 sHoennTrainerCardCopper_Pal[]        = INCBIN_U16("graphics/trainer_card/rse/copper.gbapal");
+static const u16 sKantoTrainerCardBronze_Pal[]        = INCBIN_U16("graphics/trainer_card/bronze.gbapal");
+static const u16 sHoennTrainerCardSilver_Pal[]        = INCBIN_U16("graphics/trainer_card/rse/silver.gbapal");
+static const u16 sKantoTrainerCardSilver_Pal[]        = INCBIN_U16("graphics/trainer_card/silver.gbapal");
+static const u16 sHoennTrainerCardGold_Pal[]          = INCBIN_U16("graphics/trainer_card/rse/gold.gbapal");
+static const u16 sKantoTrainerCardGold_Pal[]          = INCBIN_U16("graphics/trainer_card/gold.gbapal");
+static const u16 sHoennTrainerCardFemaleBg_Pal[]      = INCBIN_U16("graphics/trainer_card/rse/female_bg.gbapal");
+static const u16 sKantoTrainerCardFemaleBg_Pal[]      = INCBIN_U16("graphics/trainer_card/female_bg.gbapal");
+static const u16 sHoennTrainerCardBadges_Pal[]        = INCBIN_U16("graphics/trainer_card/rse/badges.gbapal");
+static const u16 sKantoTrainerCardBadges_Pal[]        = INCBIN_U16("graphics/trainer_card/badges.gbapal");
+static const u16 sTrainerCardStar_Pal[]               = INCBIN_U16("graphics/trainer_card/star.gbapal");
+static const u16 sTrainerCardStickerPal1[]            = INCBIN_U16("graphics/trainer_card/stickers1.gbapal");
+static const u16 sTrainerCardStickerPal2[]            = INCBIN_U16("graphics/trainer_card/stickers2.gbapal");
+static const u16 sTrainerCardStickerPal3[]            = INCBIN_U16("graphics/trainer_card/stickers3.gbapal");
+static const u16 sTrainerCardStickerPal4[]            = INCBIN_U16("graphics/trainer_card/stickers4.gbapal");
+static const u32 sHoennTrainerCardBadges_Gfx[]        = INCBIN_U32("graphics/trainer_card/rse/badges.4bpp.lz");
+static const u32 sKantoTrainerCardBadges_Gfx[]        = INCBIN_U32("graphics/trainer_card/badges.4bpp.lz");
 
 static const struct BgTemplate sTrainerCardBgTemplates[4] = 
 {
@@ -253,22 +253,22 @@ static const struct WindowTemplate sTrainerCardWindowTemplates[4] =
     DUMMY_WIN_TEMPLATE
 };
 
-static const u16 *const sHoennTrainerCardStarPals[] =
+static const u16 *const sHoennTrainerCardPals[] =
 {
-    gHoennTrainerCard_Pal,
-    sHoennTrainerCard1Stars_Pals,
-    sHoennTrainerCard2Stars_Pals,
-    sHoennTrainerCard3Stars_Pals,
-    sHoennTrainerCard4Stars_Pals
+    gHoennTrainerCardGreen_Pal,  // Default (0 stars)
+    sHoennTrainerCardBronze_Pal, // 1 star
+    sHoennTrainerCardCopper_Pal, // 2 stars
+    sHoennTrainerCardSilver_Pal, // 3 stars
+    sHoennTrainerCardGold_Pal,   // 4 stars
 };
 
-static const u16 *const sKantoTrainerCardStarPals[] =
+static const u16 *const sKantoTrainerCardPals[] =
 {
-    gKantoTrainerCard_Pal,
-    sKantoTrainerCard1Stars_Pals,
-    sKantoTrainerCard2Stars_Pals,
-    sKantoTrainerCard3Stars_Pals,
-    sKantoTrainerCard4Stars_Pals
+    gKantoTrainerCardBlue_Pal,   // Default (0 stars)
+    sKantoTrainerCardGreen_Pal,  // 1 star
+    sKantoTrainerCardBronze_Pal, // 2 stars
+    sKantoTrainerCardSilver_Pal, // 3 stars
+    sKantoTrainerCardGold_Pal,   // 4 stars
 };
 
 static const u8 sTrainerCardTextColors[] = {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_LIGHT_GRAY};
@@ -1479,9 +1479,9 @@ static bool8 SetTrainerCardBgsAndPals(void)
         break;
     case 2:
         if (sTrainerCardDataPtr->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);