Document and index berry_pouch

9 files changed, 10 insertions, 25 deletions

diff --git a/graphics/berry_pouch/unk_8E85C44.bin b/graphics/berry_pouch/background.bin
index 7c89a8bf0..7c89a8bf0 100644
--- a/graphics/berry_pouch/unk_8E85C44.bin
+++ b/graphics/berry_pouch/background.bin
diff --git a/graphics/berry_pouch/unk_8E85BA4.pal b/graphics/berry_pouch/background.pal
index 3398ff143..3398ff143 100644
--- a/graphics/berry_pouch/unk_8E85BA4.pal
+++ b/graphics/berry_pouch/background.pal
diff --git a/graphics/berry_pouch/background.png b/graphics/berry_pouch/background.png
new file mode 100644
index 000000000..14113b2f9
--- /dev/null
+++ b/graphics/berry_pouch/background.png
diff --git a/graphics/berry_pouch/unk_8E85BF4.pal b/graphics/berry_pouch/background_female.pal
index e7bd18cbf..e7bd18cbf 100644
--- a/graphics/berry_pouch/unk_8E85BF4.pal
+++ b/graphics/berry_pouch/background_female.pal
diff --git a/graphics/berry_pouch/unk_8E8560C.png b/graphics/berry_pouch/berry_pouch.png
index bb714c130..bb714c130 100644
--- a/graphics/berry_pouch/unk_8E8560C.png
+++ b/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 094b4ef39..000000000
--- a/graphics/berry_pouch/unk_8E859D0.png
+++ /dev/null
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");