From db0804af3bc92bfb38f19e370d99bbe8b46e8189 Mon Sep 17 00:00:00 2001
From: LiquidFenrir <liquidfenrir@outlook.fr>
Date: Fri, 15 Dec 2017 21:02:33 +0100
Subject: [PATCH] support all values returned from PTMU_GetBatteryLevel (#116)

and change the battery images style to look more like a battery
---
 include/common.h   |   1 +
 romfs/battery0.png | Bin 0 -> 498 bytes
 romfs/battery1.png | Bin 443 -> 303 bytes
 romfs/battery2.png | Bin 271 -> 319 bytes
 romfs/battery3.png | Bin 272 -> 323 bytes
 romfs/battery4.png | Bin 272 -> 323 bytes
 romfs/battery5.png | Bin 272 -> 323 bytes
 source/draw.c      |   5 +++--
 8 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100644 romfs/battery0.png

diff --git a/include/common.h b/include/common.h
index ead3454..8b6a749 100644
--- a/include/common.h
+++ b/include/common.h
@@ -55,6 +55,7 @@ enum TextureID {
     TEXTURE_FONT_RESERVED = 0, // used by pp2d for the font
     TEXTURE_ARROW,
     TEXTURE_SHUFFLE,
+    TEXTURE_BATTERY_0,
     TEXTURE_BATTERY_1,
     TEXTURE_BATTERY_2,
     TEXTURE_BATTERY_3,
diff --git a/romfs/battery0.png b/romfs/battery0.png
new file mode 100644
index 0000000000000000000000000000000000000000..484ce5de65d9a629bcf7c1a8bf9e8f80e77bb901
GIT binary patch
literal 498
zcmeAS@N?(olHy`uVBq!ia0vp^>Od^a!3H8dMEZafV{wqX6T`Z5GB1G~mUKs7M+SzC
z{oH>NS%G}c0*}aI1_o{+5N5n|x9$&6kiEpy*OmPtCyNNH=Jt>eDnKF064!{5;QX|b
z^2DN4hJwV*yb`^<)Di^~Jp(;M%PZG5r2sAR_jGX#@$f!7&2Uw-gMh>JQ`{XJh5Hjz
z{U)fb?Nx}V;K+Z#nzN@_Vab#&Q4zNzD!3<lmi^OO{H(rL=VzsX#pd0cKMQc*oMdxe
zlA*?R!>)Cap`kjbjYO1-{-5l>Ged`|a^H!5cE;6HMbZmDBv06Byi?Ns>8xdpvDXd#
zmJ8nt7HPe4_t{jLL*^MW2TSkXl%0Os_05~+Ge><^%~_-oygzeRQmK84UfQK6mrUkX
znff;GdtX>v^R5x7VAh<}$l&#f5)UfnZfxVtz1<~zd&15co)dT9&0Ae3mnd<_falQ_
zvpwz&Gevf)cs{7w+w}hT<#KV?i8t=@&+G;YPTZuk(VT;6<0m<w1wl_M?*FV2yZRes
z#^mnD5+R|YR}JG%uJ!3VVcEwVd%g3O#Qu|KbNWu4e4xM6P@wL^Wyb?uci(@18UIfD
k-}8BsUKn)MBr;Sp*jekdnz^o@1`K}&Pgg&ebxsLQ0AUQzF8}}l

literal 0
HcmV?d00001

diff --git a/romfs/battery1.png b/romfs/battery1.png
index 0cc60bcf7f4dacbdb94c0eba931d6540fd5c66d8..6ccc80dc26f0582416d8da42459c41a000507498 100644
GIT binary patch
delta 276
zcmV+v0qg#|1Fr&*B!2{FK}|sb0I`n?{9y$E000SaNLh0L01FWS01FWTe`H^g00007
zbV*G`2jK|>6a^o6?q$6I000?uMObuGZ)S9NVRB^vaA9d~bS`dXbRaY?FfK7U)Yh_O
z0001)Nkl<ZNK5V3F$%yS429v`(8CH|z}dkQrAdk<YRIN_@PCH~l@|KZsW6sO0z^Dw
zP-}%!3d9%%rf`4u;@ZV9i9Y1^spK@FxZ%NVsrPocuBEsT>`@j@;v0I)vS2*w;@m74
zkGeQF3&x`^&dq}HsEc#6U_8pgO_I}aon|S{$-}it{NV1X<ODhA?_chO|2aa6p+OED
a!UO*ULO?pnb`8w{0000<MNUMnLSTXoh;xSk

delta 417
zcmV;S0bc&E0=ol{B!32COGiWi{{a60|De66lK=n!32;bRa{vGf6951U69E94oEQKA
z00(qQO+^Rc2?P`cDYsPcBme*bNJ&INR7l6omNANiKoCWL^$d6cK{N3fW~L@4lbQ&E
zfrs!0Mqa=pm<*VTp^3QzV&DZ#9cqKw5qEHx9amRBbktq+>wo&yT@AeGdcA^~4>8VF
zRbdzgbX|wj=``hJ>?Z;MVxDDS03f1&r<(B4c@F9c_6_*9DVyvo*0!;(Ybc5WMNy!t
zDu@Vqo-a=$&*(Arz8uHl&x0}mwr%^Z_{qLw&GAp^eMdrwF;3GoG)=SARuXI0OOhlb
zm@Lbv>ly$s41dG^w(7b*+Nr84yROTIVQ|wli)>vDF3Yknwe}oA5b*teUj(<Bt!>-l
za=F0syzzYu!w_*CLkMw<+gg?-17P3x7sYR4>om?ZO<t<a;G!sENs{<4nya~0nrND)
zxZQ5+wX&Co_DH>z4*e@3W=2sI==*+LU|H6#|2d)u7aHwh-EZ{)Wwiy9;)rwn00000
LNkvXXu0mjfq7b_j

diff --git a/romfs/battery2.png b/romfs/battery2.png
index 4cc1ae5adf20bf0a48c8ba8b208e6984107720d5..c759f67d8a24ca249c30bf13eab4b29b7c4a66d5 100644
GIT binary patch
delta 292
zcmeBY+RrpWrJk`k$lZxy-8q?;3=9k`>5jgR3=A9lx&I`x0{NT;9+AZi4BSE>%y{W;
z-5;PJdx@v7EBixE77<qYig&4dfkKict`Q}{`DrEPiAAXl1&Nt?C3<<OB?=~b26~2;
zSFUYJ0V<l~>EamT;r;fSBUgihK<mSsB~Sd+>MIzp>+Nv}-*~UZ@Rfn}*;acS53XMs
zqFXE9Yd+s|L}RIop<B^8L!Sr#-W;9Uop$H5;&T5Z%lTSou`gG>7yWRR+oQhELG30o
z?b1byFC|Fave4#jTiCl9m3gUPZi;ElQpwKEn+j58<mT84&ev%9@b~oE5B9R(6>bJ7
caO+*>O<*)AW8PP{5$I9|Pgg&ebxsLQ0J~Ch5&!@I

delta 243
zcmdnb)Xy|QrJgOx+ueoXKL{?^yL>VO0|RG)M`SSr1Gg{;GcwGYBLNg-FY)wsWq-)Y
zBEl+P@h){QP-u>)i(`n#@we9waxyE5uw0lKdddCN#)Tpio7Nm)TcfZ&_dv9OTKj|q
zG4UdgYxM;Onw5Th;Eqq2ETOD2Q^M|fPn7nx($<{fb){U7ofsBeG38+JkXx5!^TqZG
z_crGL@28qR|0S4e6PtJU>+i3B4C8tBtiP*cFsF0&4j__$lp(l1_s_H{ZQuW18l0M{
qQ-bbEJ8?Mw*8N#h=<;&kS?2XqmVCBTZe0m<D1)b~pUXO@geCyxwPFAO

diff --git a/romfs/battery3.png b/romfs/battery3.png
index f9610e0516056da6d32feebd23277d596ba0f27f..804e4e506889b01af054af45a6f5f5577f575104 100644
GIT binary patch
delta 296
zcmV+@0oVSJ0>c83B!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000XT
z000XT0n*)m`~Uy|2XskIMF-&t1QZ1p0W#eg0000PbVXQnQ*UN;cVTj60B~VxZgehg
zWpp4kE-)@JIn>s&WB>pFph-kQR7gwhmO%=@APfX^>6801!G8~U_TUHlm9$B*L=6p8
zupV3(sI0I<PeL8<Js{!~KuQT>jNqJOF(LP7Zn^wX!MT3qa76gjNKvYb!y<MIxgx!C
z+kU86ohHYjLedj$oUpnjr;QU<x8$^O!s?csHcnXGlGDZstJCBfliB17n_juEd6Ua<
u=;CNZ_yi$@=OHaO!+Y+MWQQy=AqXeK6T{s(0v3b-0000<MNUMnLSTYWZgjH%

delta 244
zcmX@iG=XV?N<CYWx4R3&e-K=-cll%n1_sUokH}&M25w;xW@MN(M*=9wUgGKN%Kng(
zMTAw1(de!uP-w2Fi(`n#@we9waxyE5uw0lKdddCN#)Tpio7Nm)Tccnu{Xwkdq@v1+
zM{P2jZq^qZ=;pHfb4WZw^%#ezTHATc#ar8gxaQ;*?+v!lV`1=eZf0nBazAu#dtFP_
zL9++H<08w~-Cy0a{B*8G{r-9O>%K<v>{)+S$6!w9>>WTP|0qLnd)}XERocG)y)-yA
rRj)+dmv-W4{}%n}<s-qRzs>kXHZK3XVOE<L(4`EXu6{1-oD!M<_MKxG

diff --git a/romfs/battery4.png b/romfs/battery4.png
index a9679101f762d07d8d8043fffd342545cd13711c..14fde672b0038cbfa96ee865ee58edc4821177b9 100644
GIT binary patch
delta 296
zcmbQhbeL&^N<Cw7kh>GZx^prw85kH?(j9#r85lP9bN@+X1@buyJR*x37`TN%nDNrx
zx<5cc_7YEDSN4aTEF!GD-Qgl%fkKict`Q}{`DrEPiAAXl1&Nt?C3<<OB?=~b26~2;
zSFUYJ0V-PH>EamT;r({nLCymTJg&trPt5fxsAoJc7qeh>#N?z-DXE25sy-ZMJ}X{R
zA@nLDTk)6$tAG>3ds~TQkDil%XL{@DYiYbxY(MO@+l?z&Rz|EWUom`%d){sSiRN=v
z+z&P_cHPBLd0E#ovoGWBq{+`Zt|2i!i+WGy6t(*H-x05zbUNU}gN%p__H#RbE9#pc
juGjON<SaIG0*AU=MtJaY>r^A4YZ*LU{an^LB{Ts5Wz23d

delta 244
zcmX@iG=XV?N<CYWx4R3&e-K=-cll%n1_sUokH}&M25w;xW@MN(M*=9wUgGKN%Kng(
zMTC{NJ6z-|P-w2Fi(`n#@weB`axyE5usoO<dddCN#)Tpio7Nm)+tzd^=RmZ8TKfcr
zZf?c;ea*~qAs-H_+cf$n^-M@f`cWDinC*H_@?7rDYnnaWj15886&MtLmWMuG_<o_>
z2H79^>(^LbuMawQ_~oU!`{(uNuiqNUvuFKX9fLWYvv&ZI{-X@R?YV!ZRcZVF_tN0h
rRGktuPuhvY`L}Lmd7;b8xU;-x_pka~pnSy#=u!qxS3j3^P6<r_(O+ZO

diff --git a/romfs/battery5.png b/romfs/battery5.png
index def61fc1a2da33cf99a5e5b5458d58be4f7c7b6b..1d1d3c1978fe5dfb78b085b2be37ce8d44b5b14c 100644
GIT binary patch
delta 296
zcmV+@0oVSJ0>c83B!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000XT
z000XT0n*)m`~Uy|2XskIMF-&t1QZ7gPy*9J0000PbVXQnQ*UN;cVTj60B~VxZgehg
zWpp4kE-)@JIn>s&WB>pFph-kQR7gwhmN5>1APhyjcw|pT!hZ#r8MuH~L4Qq2!A2&L
zftUP5`Wt<5f?B-ylyjaUlv1J?BRS_-Ov(MpEhi66nCnLlkAhDRDbOqqLw&cBtB|E_
zKg@j9S#k^t9bml#`KnuT)*R_|OU{}jy>7`_bEMZTIctveI!mrhgxTcE6sV=4yva!z
uERK$XPZUBZcOkhM?sJzUJBY}H$#eqg;_A99O{U@i0000<MNUMnLSTY{7IA?9

delta 244
zcmX@iG=XV?N<CYWx4R3&e-K=-cll%n1_sUokH}&M25w;xW@MN(M*=9wUgGKN%Kng(
zMTDI@fa$UmP-w2Fi(`n#@we9waxyE5uw0lKdddCN#)Tpio7Nm)Tccnu{Xwkdq@v1+
zN0VeW-K;M-FnJOG{tv8SorX@6Iv*CF%UHW`3e)r4nD-)m+>8yEE+{Z4{45WBzEFN)
z+y>qs`@*lyeQiJWW64fl^PTbMcc1wh$+KtuSsjBpowIiUk^G|!!R>i}rd4VC{`b=0
s)Kt9^b)Vabqy1a-r<acem;N^6zjbHr=LtNsKt5vdboFyt=akR{0AA~6oB#j-

diff --git a/source/draw.c b/source/draw.c
index 49a6f5e..405a54a 100644
--- a/source/draw.c
+++ b/source/draw.c
@@ -41,6 +41,7 @@ void init_screens(void)
 
     pp2d_load_texture_png(TEXTURE_ARROW, "romfs:/arrow.png");
     pp2d_load_texture_png(TEXTURE_SHUFFLE, "romfs:/shuffle.png");
+    pp2d_load_texture_png(TEXTURE_BATTERY_0, "romfs:/battery0.png");
     pp2d_load_texture_png(TEXTURE_BATTERY_1, "romfs:/battery1.png");
     pp2d_load_texture_png(TEXTURE_BATTERY_2, "romfs:/battery2.png");
     pp2d_load_texture_png(TEXTURE_BATTERY_3, "romfs:/battery3.png");
@@ -71,9 +72,9 @@ static void draw_base_interface(void)
     #ifndef CITRA_MODE
     u8 battery_charging = 0;
     PTMU_GetBatteryChargeState(&battery_charging);
-    u8 battery_status = 1;
+    u8 battery_status = 0;
     PTMU_GetBatteryLevel(&battery_status);
-    pp2d_draw_texture(TEXTURE_BATTERY_1 + battery_status - 1, 357, 2);
+    pp2d_draw_texture(TEXTURE_BATTERY_0 + battery_status, 357, 2);
 
     if(battery_charging)
         pp2d_draw_texture(TEXTURE_BATTERY_CHARGE, 357, 2);