diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2022-01-11 11:46:58 -0500 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2022-01-11 11:46:58 -0500 |
| commit | d782d3544dd3c43ac2034df4a9a445d7ccda1982 (patch) | |
| tree | c8dfa5ddba1b3f5985a72736916e68c424891a4c | |
| parent | 565dd243098013c8665bc7f95106e2b5657e4e82 (diff) | |
Move pokeblock graphics out of interface
| -rw-r--r-- | graphics/pokeblock/device.png (renamed from graphics/interface/pokeblock_device.png) | bin | 530 -> 530 bytes | |||
| -rw-r--r-- | graphics/pokeblock/feeding_bg.bin (renamed from graphics/interface/pokeblock_feeding_bg_map.bin) | bin | 2048 -> 2048 bytes | |||
| -rw-r--r-- | graphics/pokeblock/menu.bin (renamed from graphics/interface/pokeblock.bin) | bin | 2048 -> 2048 bytes | |||
| -rw-r--r-- | graphics/pokeblock/menu.pal (renamed from graphics/interface/pokeblock_case_frame.pal) | 0 | ||||
| -rw-r--r-- | graphics/pokeblock/menu.png (renamed from graphics/interface/pokeblock_case_frame.png) | bin | 426 -> 426 bytes | |||
| -rw-r--r-- | src/graphics.c | 13 |
6 files changed, 7 insertions, 6 deletions
diff --git a/graphics/interface/pokeblock_device.png b/graphics/pokeblock/device.png Binary files differindex 65b29a8b3..65b29a8b3 100644 --- a/graphics/interface/pokeblock_device.png +++ b/graphics/pokeblock/device.png diff --git a/graphics/interface/pokeblock_feeding_bg_map.bin b/graphics/pokeblock/feeding_bg.bin Binary files differindex 9feebf8bc..9feebf8bc 100644 --- a/graphics/interface/pokeblock_feeding_bg_map.bin +++ b/graphics/pokeblock/feeding_bg.bin diff --git a/graphics/interface/pokeblock.bin b/graphics/pokeblock/menu.bin Binary files differindex 1719bb5a6..1719bb5a6 100644 --- a/graphics/interface/pokeblock.bin +++ b/graphics/pokeblock/menu.bin diff --git a/graphics/interface/pokeblock_case_frame.pal b/graphics/pokeblock/menu.pal index ef58ae778..ef58ae778 100644 --- a/graphics/interface/pokeblock_case_frame.pal +++ b/graphics/pokeblock/menu.pal diff --git a/graphics/interface/pokeblock_case_frame.png b/graphics/pokeblock/menu.png Binary files differindex ffc658821..ffc658821 100644 --- a/graphics/interface/pokeblock_case_frame.png +++ b/graphics/pokeblock/menu.png 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" |
