From 77b781b93a74c0cb2daa5c21f83f4c698f0c2bec Mon Sep 17 00:00:00 2001
From: hjk321 <37224753+hjk321@users.noreply.github.com>
Date: Sat, 10 Apr 2021 09:02:36 -0500
Subject: [PATCH] Document and index berry_pouch

---
 .../{unk_8E85C44.bin => background.bin}       | Bin
 .../{unk_8E85BA4.pal => background.pal}       |   0
 graphics/berry_pouch/background.png           | Bin 0 -> 491 bytes
 ...{unk_8E85BF4.pal => background_female.pal} |   0
 .../{unk_8E8560C.png => berry_pouch.png}      | Bin
 graphics/berry_pouch/unk_8E859D0.png          | Bin 444 -> 0 bytes
 graphics/berry_pouch/unk_8E85C1C.pal          |  19 ------------------
 graphics_file_rules.mk                        |   4 ++++
 src/graphics.c                                |  12 +++++------
 9 files changed, 10 insertions(+), 25 deletions(-)
 rename graphics/berry_pouch/{unk_8E85C44.bin => background.bin} (100%)
 rename graphics/berry_pouch/{unk_8E85BA4.pal => background.pal} (100%)
 create mode 100644 graphics/berry_pouch/background.png
 rename graphics/berry_pouch/{unk_8E85BF4.pal => background_female.pal} (100%)
 rename graphics/berry_pouch/{unk_8E8560C.png => berry_pouch.png} (100%)
 delete mode 100644 graphics/berry_pouch/unk_8E859D0.png
 delete mode 100644 graphics/berry_pouch/unk_8E85C1C.pal

diff --git a/graphics/berry_pouch/unk_8E85C44.bin b/graphics/berry_pouch/background.bin
similarity index 100%
rename from graphics/berry_pouch/unk_8E85C44.bin
rename to graphics/berry_pouch/background.bin
diff --git a/graphics/berry_pouch/unk_8E85BA4.pal b/graphics/berry_pouch/background.pal
similarity index 100%
rename from graphics/berry_pouch/unk_8E85BA4.pal
rename to graphics/berry_pouch/background.pal
diff --git a/graphics/berry_pouch/background.png b/graphics/berry_pouch/background.png
new file mode 100644
index 0000000000000000000000000000000000000000..14113b2f933d7dfe08d0278447727b4f9521ef29
GIT binary patch
literal 491
zcmV<H0Tlj;P)<h;3K|Lk000e1NJLTq002M$001}y0{{R3zc%AR0000mP)t-s06|*+
z0RJgDQbDw&{{a900RL*u#iY&dz3%`2|IM_$w3L*T?&hp&YHDhn?f_bY&(J!T0004Y
zNkl<ZIE|H+v2KGf5QhCu9#LM$OT>&)HC;=GK0u@>Yb9R6Ptb}D31wks^O~g+y|aD6
zKHH%FOW^L~!yHBt0wQ@1_r}LyUno^iVN}fkxFiBnLw#?<q=xkho17s6whV6uvSq-&
zi43QU3svwqGF&o1WXJ(o!%OE<G;{$Vr61{g0Z?iOpqCl}w1#Wne=8pgV1ejlUr4Qm
zyQibo8jVp$4{(F_kyX~9pTXnQu=aIs4acCb@st^=unz`VF+<eXSQp{_C^S4Yi;(63
zGpx^0G*Gq-HXnP2)1G1WiUlH6#$bFb00XjLQ_liDyN3|4fx<8TzAn!szz-I_I6xbi
z3LOXJ9zZKE0t+krAK(Q#$BCNeJQRUx8WjNJ1~4RsXi#nYIda1T0UC7!S4RfJ0zhn-
zSY~eEfFT3!93-t3RxWrvFybpePp}6Iz<>Y<$_DpWlQ-PZfc-({4F(=*q<xVAZg%-J
h&IEwRn{oLi;14%{7I~uJK05#a002ovPDHLkV1m{#%fJ8t

literal 0
HcmV?d00001

diff --git a/graphics/berry_pouch/unk_8E85BF4.pal b/graphics/berry_pouch/background_female.pal
similarity index 100%
rename from graphics/berry_pouch/unk_8E85BF4.pal
rename to graphics/berry_pouch/background_female.pal
diff --git a/graphics/berry_pouch/unk_8E8560C.png b/graphics/berry_pouch/berry_pouch.png
similarity index 100%
rename from graphics/berry_pouch/unk_8E8560C.png
rename to graphics/berry_pouch/berry_pouch.png
diff --git a/graphics/berry_pouch/unk_8E859D0.png b/graphics/berry_pouch/unk_8E859D0.png
deleted file mode 100644
index 094b4ef3913dc17663f08eaae3e4f7b4256b97fc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 444
zcmV;t0Ym<YP)<h;3K|Lk000e1NJLTq001BW003wN00000aOyxP0004lNkl<ZIE~Ge
zv2KGf5QZ&v>B`2OB|>6D=@a-Bkh(^d@&Fx5*Q9F19I^OyP)6RVz5ncUe5XWBJM|wx
z{`_%gz~H_pOA!YU!f7RO(U>&|r}ZF-#=IUSVrWnpduvpVo6iM6D`fyE1HF}jqcU(*
zMnzEufHID|n7s7e-Qcs2$)Nu|P&L#_0n|$GG?w(*-o*$8$eU;I(sfTEB?Fn|{Sj-#
zS)6l?zZ;V=&fXZ_yG4aSTBJw9lnkFjC1CiRSmQGGT%#D1F=;^M&c>j7DX&LdIjevy
zRT-v6`sRK%!ZkxSO|Bu}x&f*T&^K!wtx+e%A)r+X1A0Mw47wD6_*ppjz~=&Ncx%fB
zB*5F<Ef(av6j0;_$o&O;SmW7({{MlE1&<2kCodrXlWzjN!D>9Th0z28O##|y$O9UN
z*M<#wgd@$eA^izNL)z712&lxs&cO^{MV$mR*b;|T`a8e?AmL(gq4fXQ!oavq|Bs4V
mHhG`0Kv(DIM(t{pm+?0ggkxjsak<O@0000<MNUMnLSTY(RL9By

diff --git a/graphics/berry_pouch/unk_8E85C1C.pal b/graphics/berry_pouch/unk_8E85C1C.pal
deleted file mode 100644
index 87d0fc7fb..000000000
--- a/graphics/berry_pouch/unk_8E85C1C.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-222 222 90
-98 115 123
-255 205 156
-230 189 139
-213 164 115
-189 139 90
-156 82 0
-115 57 0
-197 205 213
-246 115 0
-222 57 0
-230 148 98
-255 172 123
-222 230 230
-49 57 57
-255 255 255
diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk
index f3bed2da7..d064c63c8 100644
--- a/graphics_file_rules.mk
+++ b/graphics_file_rules.mk
@@ -25,6 +25,7 @@ CREDITSGFXDIR := graphics/credits
 ITEMMENUGFXDIR := graphics/item_menu
 INTROGFXDIR := graphics/intro
 BATTLETERRAINGFXDIR := graphics/battle_terrain
+BERRYPOUCHGFXDIR := graphics/berry_pouch
 
 types := normal fight flying poison ground rock bug ghost steel mystery fire water grass electric psychic ice dragon dark
 contest_types := cool beauty cute smart tough
@@ -569,3 +570,6 @@ $(BATTLETERRAINGFXDIR)/terrain_underwater.4bpp: %.4bpp: %.png
 
 $(BATTLETERRAINGFXDIR)/terrain_water.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 81
+
+$(BERRYPOUCHGFXDIR)/background.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -num_tiles 52
diff --git a/src/graphics.c b/src/graphics.c
index 57fde9290..87c73b014 100644
--- a/src/graphics.c
+++ b/src/graphics.c
@@ -1136,12 +1136,12 @@ const u8 gItemPcTiles[] = INCBIN_U8("graphics/item_pc/unk_8E85090.4bpp.lz");
 const u32 gItemPcBgPals[] = INCBIN_U32("graphics/item_pc/unk_8E85408.gbapal.lz");
 const u8 gItemPcTilemap[] = INCBIN_U8("graphics/item_pc/unk_8E85458.bin.lz");
 
-const u32 gBerryPouchSpriteTiles[] = INCBIN_U32("graphics/berry_pouch/unk_8E8560C.4bpp.lz");
-const u8 gBerryPouchBgGfx[] = INCBIN_U8("graphics/berry_pouch/unk_8E859D0.4bpp.lz");
-const u32 gBerryPouchBgPals[] = INCBIN_U32("graphics/berry_pouch/unk_8E85BA4.gbapal.lz");
-const u32 gBerryPouchBgPal0FemaleOverride[] = INCBIN_U32("graphics/berry_pouch/unk_8E85BF4.gbapal.lz");
-const u32 gBerryPouchSpritePalette[] = INCBIN_U32("graphics/berry_pouch/unk_8E85C1C.gbapal.lz");
-const u8 gBerryPouchBg1Tilemap[] = INCBIN_U8("graphics/berry_pouch/unk_8E85C44.bin.lz");
+const u32 gBerryPouchSpriteTiles[] = INCBIN_U32("graphics/berry_pouch/berry_pouch.4bpp.lz");
+const u8 gBerryPouchBgGfx[] = INCBIN_U8("graphics/berry_pouch/background.4bpp.lz");
+const u32 gBerryPouchBgPals[] = INCBIN_U32("graphics/berry_pouch/background.gbapal.lz");
+const u32 gBerryPouchBgPal0FemaleOverride[] = INCBIN_U32("graphics/berry_pouch/background_female.gbapal.lz");
+const u32 gBerryPouchSpritePalette[] = INCBIN_U32("graphics/berry_pouch/berry_pouch.gbapal.lz");
+const u8 gBerryPouchBg1Tilemap[] = INCBIN_U8("graphics/berry_pouch/background.bin.lz");
 
 const u32 gBuyMenuFrame_Gfx[] = INCBIN_U32("graphics/shop_menu/shop_menu.4bpp.lz");
 const u32 gBuyMenuFrame_Tilemap[] = INCBIN_U32("graphics/shop_menu/shop_tilemap.bin");