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: Document and index berry_pouch --- graphics/berry_pouch/background.bin | Bin 0 -> 2048 bytes graphics/berry_pouch/background.pal | 51 +++++++++++++++++++++++++++++ graphics/berry_pouch/background.png | Bin 0 -> 491 bytes graphics/berry_pouch/background_female.pal | 19 +++++++++++ graphics/berry_pouch/berry_pouch.png | Bin 0 -> 782 bytes graphics/berry_pouch/unk_8E8560C.png | Bin 782 -> 0 bytes graphics/berry_pouch/unk_8E859D0.png | Bin 444 -> 0 bytes graphics/berry_pouch/unk_8E85BA4.pal | 51 ----------------------------- graphics/berry_pouch/unk_8E85BF4.pal | 19 ----------- graphics/berry_pouch/unk_8E85C1C.pal | 19 ----------- graphics/berry_pouch/unk_8E85C44.bin | Bin 2048 -> 0 bytes graphics_file_rules.mk | 4 +++ src/graphics.c | 12 +++---- 13 files changed, 80 insertions(+), 95 deletions(-) create mode 100644 graphics/berry_pouch/background.bin create mode 100644 graphics/berry_pouch/background.pal create mode 100644 graphics/berry_pouch/background.png create mode 100644 graphics/berry_pouch/background_female.pal create mode 100644 graphics/berry_pouch/berry_pouch.png delete mode 100644 graphics/berry_pouch/unk_8E8560C.png delete mode 100644 graphics/berry_pouch/unk_8E859D0.png delete mode 100644 graphics/berry_pouch/unk_8E85BA4.pal delete mode 100644 graphics/berry_pouch/unk_8E85BF4.pal delete mode 100644 graphics/berry_pouch/unk_8E85C1C.pal delete mode 100644 graphics/berry_pouch/unk_8E85C44.bin diff --git a/graphics/berry_pouch/background.bin b/graphics/berry_pouch/background.bin new file mode 100644 index 000000000..7c89a8bf0 Binary files /dev/null and b/graphics/berry_pouch/background.bin differ diff --git a/graphics/berry_pouch/background.pal b/graphics/berry_pouch/background.pal new file mode 100644 index 000000000..3398ff143 --- /dev/null +++ b/graphics/berry_pouch/background.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +0 65 90 +255 0 255 +41 57 82 +65 180 164 +255 0 255 +255 0 255 +106 205 197 +164 205 238 +189 238 255 +255 255 205 +180 189 180 +148 148 148 +238 230 172 +106 106 106 +106 156 238 +0 90 131 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +189 213 213 +238 255 255 +222 246 255 +255 255 255 +164 222 255 +16 172 222 +0 82 115 +0 115 139 +0 123 197 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +189 213 213 +238 255 255 +222 246 255 +255 255 255 +164 222 255 +24 82 180 +0 90 131 +24 82 180 +24 82 180 diff --git a/graphics/berry_pouch/background.png b/graphics/berry_pouch/background.png new file mode 100644 index 000000000..14113b2f9 Binary files /dev/null and b/graphics/berry_pouch/background.png differ diff --git a/graphics/berry_pouch/background_female.pal b/graphics/berry_pouch/background_female.pal new file mode 100644 index 000000000..e7bd18cbf --- /dev/null +++ b/graphics/berry_pouch/background_female.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 65 90 +255 0 255 +41 57 82 +213 139 115 +255 0 255 +255 0 255 +255 172 148 +164 205 238 +189 238 255 +255 255 205 +180 189 180 +148 148 148 +238 230 172 +106 106 106 +106 156 238 +0 90 131 diff --git a/graphics/berry_pouch/berry_pouch.png b/graphics/berry_pouch/berry_pouch.png new file mode 100644 index 000000000..bb714c130 Binary files /dev/null and b/graphics/berry_pouch/berry_pouch.png differ diff --git a/graphics/berry_pouch/unk_8E8560C.png b/graphics/berry_pouch/unk_8E8560C.png deleted file mode 100644 index bb714c130..000000000 Binary files a/graphics/berry_pouch/unk_8E8560C.png and /dev/null differ diff --git a/graphics/berry_pouch/unk_8E859D0.png b/graphics/berry_pouch/unk_8E859D0.png deleted file mode 100644 index 094b4ef39..000000000 Binary files a/graphics/berry_pouch/unk_8E859D0.png and /dev/null differ diff --git a/graphics/berry_pouch/unk_8E85BA4.pal b/graphics/berry_pouch/unk_8E85BA4.pal deleted file mode 100644 index 3398ff143..000000000 --- a/graphics/berry_pouch/unk_8E85BA4.pal +++ /dev/null @@ -1,51 +0,0 @@ -JASC-PAL -0100 -48 -0 65 90 -255 0 255 -41 57 82 -65 180 164 -255 0 255 -255 0 255 -106 205 197 -164 205 238 -189 238 255 -255 255 205 -180 189 180 -148 148 148 -238 230 172 -106 106 106 -106 156 238 -0 90 131 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -189 213 213 -238 255 255 -222 246 255 -255 255 255 -164 222 255 -16 172 222 -0 82 115 -0 115 139 -0 123 197 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -189 213 213 -238 255 255 -222 246 255 -255 255 255 -164 222 255 -24 82 180 -0 90 131 -24 82 180 -24 82 180 diff --git a/graphics/berry_pouch/unk_8E85BF4.pal b/graphics/berry_pouch/unk_8E85BF4.pal deleted file mode 100644 index e7bd18cbf..000000000 --- a/graphics/berry_pouch/unk_8E85BF4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 65 90 -255 0 255 -41 57 82 -213 139 115 -255 0 255 -255 0 255 -255 172 148 -164 205 238 -189 238 255 -255 255 205 -180 189 180 -148 148 148 -238 230 172 -106 106 106 -106 156 238 -0 90 131 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/berry_pouch/unk_8E85C44.bin b/graphics/berry_pouch/unk_8E85C44.bin deleted file mode 100644 index 7c89a8bf0..000000000 Binary files a/graphics/berry_pouch/unk_8E85C44.bin and /dev/null differ 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"); -- cgit v1.2.3