From d782d3544dd3c43ac2034df4a9a445d7ccda1982 Mon Sep 17 00:00:00 2001
From: GriffinR <griffin.g.richards@gmail.com>
Date: Tue, 11 Jan 2022 11:46:58 -0500
Subject: [PATCH] Move pokeblock graphics out of interface

---
 .../pokeblock_device.png => pokeblock/device.png}  | Bin
 .../feeding_bg.bin}                                | Bin
 .../pokeblock.bin => pokeblock/menu.bin}           | Bin
 .../menu.pal}                                      |   0
 .../menu.png}                                      | Bin
 src/graphics.c                                     |  13 +++++++------
 6 files changed, 7 insertions(+), 6 deletions(-)
 rename graphics/{interface/pokeblock_device.png => pokeblock/device.png} (100%)
 rename graphics/{interface/pokeblock_feeding_bg_map.bin => pokeblock/feeding_bg.bin} (100%)
 rename graphics/{interface/pokeblock.bin => pokeblock/menu.bin} (100%)
 rename graphics/{interface/pokeblock_case_frame.pal => pokeblock/menu.pal} (100%)
 rename graphics/{interface/pokeblock_case_frame.png => pokeblock/menu.png} (100%)

diff --git a/graphics/interface/pokeblock_device.png b/graphics/pokeblock/device.png
similarity index 100%
rename from graphics/interface/pokeblock_device.png
rename to graphics/pokeblock/device.png
diff --git a/graphics/interface/pokeblock_feeding_bg_map.bin b/graphics/pokeblock/feeding_bg.bin
similarity index 100%
rename from graphics/interface/pokeblock_feeding_bg_map.bin
rename to graphics/pokeblock/feeding_bg.bin
diff --git a/graphics/interface/pokeblock.bin b/graphics/pokeblock/menu.bin
similarity index 100%
rename from graphics/interface/pokeblock.bin
rename to graphics/pokeblock/menu.bin
diff --git a/graphics/interface/pokeblock_case_frame.pal b/graphics/pokeblock/menu.pal
similarity index 100%
rename from graphics/interface/pokeblock_case_frame.pal
rename to graphics/pokeblock/menu.pal
diff --git a/graphics/interface/pokeblock_case_frame.png b/graphics/pokeblock/menu.png
similarity index 100%
rename from graphics/interface/pokeblock_case_frame.png
rename to graphics/pokeblock/menu.png
diff --git a/src/graphics.c b/src/graphics.c
index fda9a3fd5e..ebb7be3cac 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"