From 1707f82992c83b5662b22faa43cc44c29bf49585 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Fri, 13 Jan 2023 12:51:34 -0500 Subject: [PATCH] Combine/colorize status graphics --- .../battle_interface/ball_caught_indicator.png | Bin 103 -> 158 bytes graphics/battle_interface/status.png | Bin 0 -> 531 bytes graphics/battle_interface/status2.png | Bin 198 -> 531 bytes graphics/battle_interface/status3.png | Bin 199 -> 530 bytes graphics/battle_interface/status4.png | Bin 198 -> 530 bytes graphics/battle_interface/status_brn.png | Bin 176 -> 0 bytes graphics/battle_interface/status_frz.png | Bin 177 -> 0 bytes graphics/battle_interface/status_par.png | Bin 176 -> 0 bytes graphics/battle_interface/status_psn.png | Bin 176 -> 0 bytes graphics/battle_interface/status_slp.png | Bin 176 -> 0 bytes src/graphics.c | 12 ++++-------- 11 files changed, 4 insertions(+), 8 deletions(-) create mode 100644 graphics/battle_interface/status.png delete mode 100644 graphics/battle_interface/status_brn.png delete mode 100644 graphics/battle_interface/status_frz.png delete mode 100644 graphics/battle_interface/status_par.png delete mode 100644 graphics/battle_interface/status_psn.png delete mode 100644 graphics/battle_interface/status_slp.png diff --git a/graphics/battle_interface/ball_caught_indicator.png b/graphics/battle_interface/ball_caught_indicator.png index 4eb765d280419817c27b4e149f4585257f9e152b..5473d53df88cda1e6ef5096507e75e2626a2f21f 100644 GIT binary patch delta 140 zcmYeF$2dWgsU@79T2!^XxyN9 rg!Ke}kQrY>f~i?*0>kMh28J1T*(#FzEG_{xF?hPN`MIofN@xNAH#9Z8 delta 84 zcmbQom_9+$j{yi&rtpLTDLqdY#}JO0$v^gI{jG0{zrOjOv5vlf^!W`{-&cL*$$md4 m^8AO_XIB2_Nx1pnfq~&ElVn!@@)ZX`CV0B~xvXJJgW!mrwI~dz z=c1>JV~EDY*8ZDg;5i6He;!Br@t37d4|0&(7U5tj>A0p~uCwU*=;@P! z{$}_k?`;Ux(p#{6@_Xs!^O%c1eEsoy$AW1(|1L_ktJxV%o-}FA+bRDU*D+1E%3qT$ zeStUS;`>5J+sHr7!42itSscBtOUXnyGg#X+)_H$*U&(sy@ugndYrl6an5gs5u+61# zo}}iTrbN9*6-?9E3#P7kF0J^i!Efc~kJk$wjU)dg`|&+2nR(^QV$0s*#;a>yFkIWS jL}&)*1>LRk_0r#&tCuEjE<9<-0}2pNS3j3^P6JJgW!mrwI~dz z=c1>JV~EDY*8ZDA0p~uCwU*=;@P! z{$}_k?`;Ux(p#{6@_Xs!^O%c1eEsoy$AW1(|1L_ktJxV%o-}FA+bRDU*D+1E%3qT$ zeStUS;`>5J+sHr7!42itSscBtOUXnyGg#X+)_H$*U&(sy@ugndYrl6an5gs5u+61# zo}}iTrbN9*6-?9E3#P7kF0J^i!Efc~kJk$wjU)dg`|&+2nR(^QV$0s*#;a>yFkIWS kL}&)*1>LRk_0r#&_n9W&Svc*K1}H#0UHx3vIVCg!0Nbs$<^TWy delta 182 zcmV;n07?Io1jYf77=Hu+00004mWYS|0050iL_t(2k&Tf%4#O}ELvt3+<^A{UT{xF_ zsr-?u0x422G9iJ_qK_B$dD_QGgCg_@fv6%SY(a!t!Wc3;ao^$$Q3hYuR~(~p%B>4W z8L$tBNX{I);lSb4IY{d$O>m8&jV%u53xL~w k@l2;ew0fed|M7KhZ{kGHh!0zlr2qf`07*qoM6N<$g7~vgH~;_u diff --git a/graphics/battle_interface/status3.png b/graphics/battle_interface/status3.png index 8a0db03219f68682e79489bcdf96576dcf1d7c14..d0febfb17c501b1f65d1e835c79d7dfede349004 100644 GIT binary patch literal 530 zcmeAS@N?(olHy`uVBq!ia0vp^5JJgW!mrwI~dz z=Ypq;V~EDY*8ZD<%nBSXbD!Q9(m4o3|4wr*4>w5^nb5AS7GT$-Fm1;<#qQ^8y**FW znJhQVKcFQkec|${=e?ol87+TQ{jt!l6TiaOUB5*wa8A0L z(Dns0yKm$j_{6YI=<8><4$B3hS+yWb4w0NScEf?(sdJFlUYcNxp^XIx>jl8=J|^EMbDQDxbTB~FK9gG=OHS;gKXTKL l|ItdPLX=%4I%4cQw-JJgW!mrwI~dz z=Ypq;V~EDY*8WaGW(5wGxr-URH?RQF@AqnZ>MphfI*9rEEU1xi)G3_nEOtJ6`lKm; zGyIb8HG~?OEm%JFy!7gM%tar*{wR(Ku+;e%$knc7XEb@zq%|+6{AXOpG(9T6CtLUe zU&_Vzg^pi0{9s?s@O~9%(~?!D78}|a%62sF^1izI3d7^Vm&asY+v=^575kszyU5~v zk4m1SvG~Tj4Nnb1cKNLOeR0k)y8{_vTNtwCg8nLP gWw^EU+2i$v_RbqK^w{H8oC1Z1r>mdKI;Vst0B7a3!2kdN delta 182 zcmV;n07?In1jYf77=Hu+00004mWYS|0050iL_t(2k&Tgo4TLZZ13duQf1NIXlmXtm zyxX)PFN%01lv=fX#NdPZoFtkN<_13`py_7rn8F|xLT|Ut8=a?U5*hFlz2gvtlWA2@ zqr)zaVR44-g##+7a*dsTU@yphIyY~8abh3-(HkHB k4@Wy$B7N6r3){W7FC06mXXsFlRR91007*qoM6N<$g7}6`umAu6 diff --git a/graphics/battle_interface/status_brn.png b/graphics/battle_interface/status_brn.png deleted file mode 100644 index 8f13fe6de2abe74b24c359a6d97cea8f0da4b004..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 176 zcmeAS@N?(olHy`uVBq!ia0vp^5)79ueX>b%!%OSShwa kc$Y!;w*&20H{1PK&%c*ffBF|=r7n;~p00i_>zopr0Qc5ETL1t6 diff --git a/graphics/battle_interface/status_frz.png b/graphics/battle_interface/status_frz.png deleted file mode 100644 index ce10db3e4e87d50b5b1c888914653d28f262603b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 177 zcmeAS@N?(olHy`uVBq!ia0vp^5);^_VN=d_!M1|*P78<9QIQ-ygVpcgQv((tj%7JqS lkH=lf4U7t@0n8J6*%(ygjI@8Sf0_ld$UffrqJv0mNwFwWTv!^)c43mh;Td9qf+kUQU diff --git a/graphics/battle_interface/status_psn.png b/graphics/battle_interface/status_psn.png deleted file mode 100644 index 700e7038a1a86d05fe6b88104f66e0bc4f1d3b7f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 176 zcmeAS@N?(olHy`uVBq!ia0vp^5{#)>t@Kn4H+ diff --git a/graphics/battle_interface/status_slp.png b/graphics/battle_interface/status_slp.png deleted file mode 100644 index bcbd16d1db11d28f3b458a3debf8747baa4933bf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 176 zcmeAS@N?(olHy`uVBq!ia0vp^521?gwMlXb$xwehLNa7bz@v k+#~(AY#~dK6X&j9480=8lP{FBCx9&SboFyt=akR{0G~)aRsaA1 diff --git a/src/graphics.c b/src/graphics.c index 9619e471f5..580fd31e90 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -356,19 +356,15 @@ const u16 gBattleInterface_BallDisplayPal[] = INCBIN_U16("graphics/battle_interf const u8 gHealthboxElementsGfxTable[] = INCBIN_U8("graphics/battle_interface/hpbar.4bpp", "graphics/battle_interface/expbar.4bpp", - "graphics/battle_interface/status_psn.4bpp", - "graphics/battle_interface/status_par.4bpp", - "graphics/battle_interface/status_slp.4bpp", - "graphics/battle_interface/status_frz.4bpp", - "graphics/battle_interface/status_brn.4bpp", + "graphics/battle_interface/status.4bpp", "graphics/battle_interface/misc.4bpp", "graphics/battle_interface/hpbar_anim.4bpp", "graphics/battle_interface/misc_frameend.4bpp", "graphics/battle_interface/ball_display.4bpp", "graphics/battle_interface/ball_caught_indicator.4bpp", - "graphics/battle_interface/status2.4bpp", // these three duplicate sets of graphics are for the opponent pokemon - "graphics/battle_interface/status3.4bpp", // and are also for use in double battles. they use dynamic palettes so - "graphics/battle_interface/status4.4bpp", // coloring them is an extreme headache and wont be done for now + "graphics/battle_interface/status2.4bpp", // these three duplicate sets of graphics are for the opponent/partner pokemon + "graphics/battle_interface/status3.4bpp", + "graphics/battle_interface/status4.4bpp", "graphics/battle_interface/healthbox_doubles_frameend.4bpp", "graphics/battle_interface/healthbox_doubles_frameend_bar.4bpp"); const u32 gBattleInterfaceGfx_UnusedWindow3[] = INCBIN_U32("graphics/battle_interface/unused_window3.4bpp.lz");