From 67e930941509cae20055f51bf14cb88c3617e234 Mon Sep 17 00:00:00 2001
From: SBird <sbird@no.tld>
Date: Fri, 1 May 2020 20:51:29 +0200
Subject: [PATCH 1/2] gfx: fix hpbar_anim.png visual palette

---
 graphics/battle_interface/hpbar_anim.png | Bin 205 -> 216 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/graphics/battle_interface/hpbar_anim.png b/graphics/battle_interface/hpbar_anim.png
index 9e7564234eb702b3b0ba600ecd4fe1dbeaf87523..5817a6e675ece82306810ed6ab2a7572deba7a71 100644
GIT binary patch
delta 200
zcmX@hc!P0*L_G&H0|SHN+O{P?im^Dz-HBn{IhmJ0jzNG=h%1n`w6y&H|Nqsqdz+iP
zy&R*0vZDTPss1*l_+D02@&7eZSDXJovpl<o<A0Rp8b`05CtmD8Jz<_Mjv*GkXD=)A
zH8}9NTx?4TFHL(_AI&4*tgQHD_VQJ?!hEy&SNA1eb=)Py)#|h`;KUCuw&sHg1~aNt
wdm*4FfAPf(6RF;L+c&N6`<z>E|8uc$*d5`G`|JAt0<B>1boFyt=akR{0Nwdjq5uE@

delta 189
zcmcb?c$RU3L_G^L0|Ud8*zBc1${@fe#1%*b!T<mNAq+3asGzJU2pdio|6dbzwfX-u
z%d=}ZD!LuF10^CnT^vI+Ca%4(k@tWBhf84ENxw+N#k&@jdU|_4pY`W6Pt8lu>rFR9
z?gxD1N!8D7F;GfTPHAT|ligyl>*<203*KjP>+zIF7DTRd>=bgFs^TSNT7K)s=H<T_
X|6X1#Y4Fcw4#;*-S3j3^P6<r_svAVU


From 7c4c1d3a5cb193aaff03f93bc7cc98bf3edd04d7 Mon Sep 17 00:00:00 2001
From: SBird <sbird@no.tld>
Date: Sun, 3 May 2020 15:24:33 +0200
Subject: [PATCH 2/2] gfx: merge battle_interface gfx table

---
 src/graphics.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/graphics.c b/src/graphics.c
index 83fab7dee3..daae1d8967 100644
--- a/src/graphics.c
+++ b/src/graphics.c
@@ -356,16 +356,16 @@ const u16 gBattleInterface_BallStatusBarPal[] = INCBIN_U16("graphics/battle_inte
 const u16 gBattleInterface_BallDisplayPal[] = INCBIN_U16("graphics/battle_interface/ball_display.gbapal");
 
 //Originally an array?
-const u8 gHealthboxElementsGfxTable[] = INCBIN_U8("graphics/battle_interface/hpbar.4bpp");
-const u8 gHealthboxElementsGfxTable_ExpBar[] = INCBIN_U8("graphics/battle_interface/expbar.4bpp");
-const u8 gHealthboxElementsGfxTable_StatusPsn[] = INCBIN_U8("graphics/battle_interface/status_psn.4bpp");
-const u8 gHealthboxElementsGfxTable_StatusPar[] = INCBIN_U8("graphics/battle_interface/status_par.4bpp");
-const u8 gHealthboxElementsGfxTable_StatusSlp[] = INCBIN_U8("graphics/battle_interface/status_slp.4bpp");
-const u8 gHealthboxElementsGfxTable_StatusFrz[] = INCBIN_U8("graphics/battle_interface/status_frz.4bpp");
-const u8 gHealthboxElementsGfxTable_StatusBrn[] = INCBIN_U8("graphics/battle_interface/status_brn.4bpp");
-const u8 gHealthboxElementsGfxTable_Misc[] = INCBIN_U8("graphics/battle_interface/misc.4bpp");
-const u8 gHealthboxElementsGfxTable_HpBarAnim[] = INCBIN_U8("graphics/battle_interface/hpbar_anim.4bpp");
-const u8 gHealthboxElementsGfxTable_MiscFrameEnd[] = INCBIN_U8("graphics/battle_interface/misc_frameend.4bpp");
+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/misc.4bpp",
+                                                  "graphics/battle_interface/hpbar_anim.4bpp",
+                                                  "graphics/battle_interface/misc_frameend.4bpp");
 
 const u8 gBattleInterface_BallDisplayGfx[] = INCBIN_U8("graphics/battle_interface/ball_display.4bpp");