From d782d3544dd3c43ac2034df4a9a445d7ccda1982 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 11 Jan 2022 11:46:58 -0500 Subject: Move pokeblock graphics out of interface --- graphics/interface/pokeblock.bin | Bin 2048 -> 0 bytes graphics/interface/pokeblock_case_frame.pal | 99 ------------------------ graphics/interface/pokeblock_case_frame.png | Bin 426 -> 0 bytes graphics/interface/pokeblock_device.png | Bin 530 -> 0 bytes graphics/interface/pokeblock_feeding_bg_map.bin | Bin 2048 -> 0 bytes graphics/pokeblock/device.png | Bin 0 -> 530 bytes graphics/pokeblock/feeding_bg.bin | Bin 0 -> 2048 bytes graphics/pokeblock/menu.bin | Bin 0 -> 2048 bytes graphics/pokeblock/menu.pal | 99 ++++++++++++++++++++++++ graphics/pokeblock/menu.png | Bin 0 -> 426 bytes src/graphics.c | 13 ++-- 11 files changed, 106 insertions(+), 105 deletions(-) delete mode 100644 graphics/interface/pokeblock.bin delete mode 100644 graphics/interface/pokeblock_case_frame.pal delete mode 100644 graphics/interface/pokeblock_case_frame.png delete mode 100644 graphics/interface/pokeblock_device.png delete mode 100644 graphics/interface/pokeblock_feeding_bg_map.bin create mode 100644 graphics/pokeblock/device.png create mode 100644 graphics/pokeblock/feeding_bg.bin create mode 100644 graphics/pokeblock/menu.bin create mode 100644 graphics/pokeblock/menu.pal create mode 100644 graphics/pokeblock/menu.png diff --git a/graphics/interface/pokeblock.bin b/graphics/interface/pokeblock.bin deleted file mode 100644 index 1719bb5a6..000000000 Binary files a/graphics/interface/pokeblock.bin and /dev/null differ diff --git a/graphics/interface/pokeblock_case_frame.pal b/graphics/interface/pokeblock_case_frame.pal deleted file mode 100644 index ef58ae778..000000000 --- a/graphics/interface/pokeblock_case_frame.pal +++ /dev/null @@ -1,99 +0,0 @@ -JASC-PAL -0100 -96 -0 0 0 -123 205 189 -238 246 255 -213 230 255 -255 0 0 -115 131 238 -90 90 98 -123 180 189 -131 131 164 -0 0 0 -0 0 0 -197 197 197 -205 65 24 -255 123 90 -255 180 148 -255 255 255 -0 0 0 -0 0 0 -0 0 0 -238 246 255 -0 0 0 -0 0 0 -90 90 98 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -197 197 197 -106 139 189 -148 213 255 -180 238 255 -255 255 255 -0 0 0 -0 0 0 -0 0 0 -255 238 238 -0 0 0 -0 0 0 -90 90 98 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -197 197 197 -205 90 172 -255 156 197 -255 197 213 -255 255 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -106 180 115 -148 246 98 -205 255 139 -255 255 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -180 180 49 -246 230 49 -255 255 148 -255 255 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -148 148 139 -222 222 222 -238 238 238 -255 255 255 diff --git a/graphics/interface/pokeblock_case_frame.png b/graphics/interface/pokeblock_case_frame.png deleted file mode 100644 index ffc658821..000000000 Binary files a/graphics/interface/pokeblock_case_frame.png and /dev/null differ diff --git a/graphics/interface/pokeblock_device.png b/graphics/interface/pokeblock_device.png deleted file mode 100644 index 65b29a8b3..000000000 Binary files a/graphics/interface/pokeblock_device.png and /dev/null differ diff --git a/graphics/interface/pokeblock_feeding_bg_map.bin b/graphics/interface/pokeblock_feeding_bg_map.bin deleted file mode 100644 index 9feebf8bc..000000000 Binary files a/graphics/interface/pokeblock_feeding_bg_map.bin and /dev/null differ diff --git a/graphics/pokeblock/device.png b/graphics/pokeblock/device.png new file mode 100644 index 000000000..65b29a8b3 Binary files /dev/null and b/graphics/pokeblock/device.png differ diff --git a/graphics/pokeblock/feeding_bg.bin b/graphics/pokeblock/feeding_bg.bin new file mode 100644 index 000000000..9feebf8bc Binary files /dev/null and b/graphics/pokeblock/feeding_bg.bin differ diff --git a/graphics/pokeblock/menu.bin b/graphics/pokeblock/menu.bin new file mode 100644 index 000000000..1719bb5a6 Binary files /dev/null and b/graphics/pokeblock/menu.bin differ diff --git a/graphics/pokeblock/menu.pal b/graphics/pokeblock/menu.pal new file mode 100644 index 000000000..ef58ae778 --- /dev/null +++ b/graphics/pokeblock/menu.pal @@ -0,0 +1,99 @@ +JASC-PAL +0100 +96 +0 0 0 +123 205 189 +238 246 255 +213 230 255 +255 0 0 +115 131 238 +90 90 98 +123 180 189 +131 131 164 +0 0 0 +0 0 0 +197 197 197 +205 65 24 +255 123 90 +255 180 148 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +238 246 255 +0 0 0 +0 0 0 +90 90 98 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +197 197 197 +106 139 189 +148 213 255 +180 238 255 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +255 238 238 +0 0 0 +0 0 0 +90 90 98 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +197 197 197 +205 90 172 +255 156 197 +255 197 213 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +106 180 115 +148 246 98 +205 255 139 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +180 180 49 +246 230 49 +255 255 148 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +148 148 139 +222 222 222 +238 238 238 +255 255 255 diff --git a/graphics/pokeblock/menu.png b/graphics/pokeblock/menu.png new file mode 100644 index 000000000..ffc658821 Binary files /dev/null and b/graphics/pokeblock/menu.png differ diff --git a/src/graphics.c b/src/graphics.c index fda9a3fd5..ebb7be3ca 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -1163,13 +1163,14 @@ const u32 gMenuMoneyGfx[] = INCBIN_U32("graphics/interface/money.4bpp.lz"); // Pokeblock -const u32 gMenuPokeblock_Gfx[] = INCBIN_U32("graphics/interface/pokeblock_case_frame.4bpp.lz"); -const u32 gMenuPokeblock_Pal[] = INCBIN_U32("graphics/interface/pokeblock_case_frame.gbapal.lz"); +const u32 gMenuPokeblock_Gfx[] = INCBIN_U32("graphics/pokeblock/menu.4bpp.lz"); +const u32 gMenuPokeblock_Pal[] = INCBIN_U32("graphics/pokeblock/menu.gbapal.lz"); -const u32 gMenuPokeblockDevice_Gfx[] = INCBIN_U32("graphics/interface/pokeblock_device.4bpp.lz"); -const u32 gMenuPokeblockDevice_Pal[] = INCBIN_U32("graphics/interface/pokeblock_device.gbapal.lz"); +const u32 gMenuPokeblockDevice_Gfx[] = INCBIN_U32("graphics/pokeblock/device.4bpp.lz"); +const u32 gMenuPokeblockDevice_Pal[] = INCBIN_U32("graphics/pokeblock/device.gbapal.lz"); + +const u32 gMenuPokeblock_Tilemap[] = INCBIN_U32("graphics/pokeblock/menu.bin.lz"); -const u32 gMenuPokeblock_Tilemap[] = INCBIN_U32("graphics/interface/pokeblock.bin.lz"); const u32 gPokeblock_Gfx[] = INCBIN_U32("graphics/pokeblock/pokeblock.4bpp.lz"); const u32 gPokeblockRed_Pal[] = INCBIN_U32("graphics/pokeblock/red.gbapal.lz"); const u32 gPokeblockBlue_Pal[] = INCBIN_U32("graphics/pokeblock/blue.gbapal.lz"); @@ -1186,7 +1187,7 @@ const u32 gPokeblockBlack_Pal[] = INCBIN_U32("graphics/pokeblock/black.gbapal.lz const u32 gPokeblockWhite_Pal[] = INCBIN_U32("graphics/pokeblock/white.gbapal.lz"); const u32 gPokeblockGold_Pal[] = INCBIN_U32("graphics/pokeblock/gold.gbapal.lz"); -const u32 gPokeblockFeedBg_Tilemap[] = INCBIN_U32("graphics/interface/pokeblock_feeding_bg_map.bin.lz"); +const u32 gPokeblockFeedBg_Tilemap[] = INCBIN_U32("graphics/pokeblock/feeding_bg.bin.lz"); #include "data/graphics/berries.h" #include "data/graphics/rayquaza_scene.h" -- cgit v1.2.3