From 3c149d42bca0e30274f9b6ee05b1a88adf3510f0 Mon Sep 17 00:00:00 2001 From: Jo Ruby P Date: Tue, 31 Jul 2018 04:26:57 +0100 Subject: gUnknown_08E96EC8 is now gBagScreenLabels_Tilemap and corresponding unknown_E96EC8.bin is now bag_screen_labels.bin and moved into interface. --- data/graphics.s | 4 ++-- graphics/interface/bag_screen_labels.bin | Bin 0 -> 2048 bytes graphics/unknown/unknown_E96EC8.bin | Bin 2048 -> 0 bytes include/graphics.h | 2 +- src/item_menu.c | 10 +++++----- 5 files changed, 8 insertions(+), 8 deletions(-) create mode 100644 graphics/interface/bag_screen_labels.bin delete mode 100644 graphics/unknown/unknown_E96EC8.bin diff --git a/data/graphics.s b/data/graphics.s index f48723501..587be6df0 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -4039,8 +4039,8 @@ gUnknown_08E96D2C:: @ 8E96D2C .incbin "graphics/unknown/unknown_E96D2C.bin.lz" .align 2 -gUnknown_08E96EC8:: @ 8E96EC8 - .incbin "graphics/unknown/unknown_E96EC8.bin" +gBagScreenLabels_Tilemap:: @ 8E96EC8 + .incbin "graphics/interface/bag_screen_labels.bin" .align 2 gSlotMachineSpritePalette0:: @ 8E976C8 diff --git a/graphics/interface/bag_screen_labels.bin b/graphics/interface/bag_screen_labels.bin new file mode 100644 index 000000000..eaaed586e Binary files /dev/null and b/graphics/interface/bag_screen_labels.bin differ diff --git a/graphics/unknown/unknown_E96EC8.bin b/graphics/unknown/unknown_E96EC8.bin deleted file mode 100644 index eaaed586e..000000000 Binary files a/graphics/unknown/unknown_E96EC8.bin and /dev/null differ diff --git a/include/graphics.h b/include/graphics.h index d9390e1b6..f242e3752 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -2615,7 +2615,7 @@ extern const u8 gMailTilemap_Dream[]; extern const u8 gMailTilemap_Fab[]; extern const u8 gMailTilemap_Retro[]; -extern const u8 gUnknown_08E96EC8[]; +extern const u8 gBagScreenLabels_Tilemap[]; extern const u8 gMenuTrainerCard_Gfx[]; extern const u16 gMenuTrainerCard0Star_Pal[]; diff --git a/src/item_menu.c b/src/item_menu.c index 915aa5183..414440a65 100644 --- a/src/item_menu.c +++ b/src/item_menu.c @@ -762,7 +762,7 @@ static void sub_80A39B8(u16 *a, u8 b) { u8 var = b * 2; - sub_809D104(a, 4, 10, gUnknown_08E96EC8, 0, var, 8, 2); + sub_809D104(a, 4, 10, gBagScreenLabels_Tilemap, 0, var, 8, 2); } static void sub_80A39E4(u16 *a, u8 b, u8 c, s8 d) @@ -776,8 +776,8 @@ static void sub_80A39E4(u16 *a, u8 b, u8 c, s8 d) if (b == 5) r7 = 2; - sub_809D104(a, 4, 10, gUnknown_08E96EC8, 8 - c, r2, c, 2); - sub_809D104(a, c + 4, 10, gUnknown_08E96EC8, 0, r7, 8 - c, 2); + sub_809D104(a, 4, 10, gBagScreenLabels_Tilemap, 8 - c, r2, c, 2); + sub_809D104(a, c + 4, 10, gBagScreenLabels_Tilemap, 0, r7, 8 - c, 2); } else if (d == 1) { @@ -785,8 +785,8 @@ static void sub_80A39E4(u16 *a, u8 b, u8 c, s8 d) if (b == 1) r7 = 10; - sub_809D104(a, 4, 10, gUnknown_08E96EC8, c, r7, 8 - c, 2); - sub_809D104(a, 12 - c, 10, gUnknown_08E96EC8, 0, r2, c, 2); + sub_809D104(a, 4, 10, gBagScreenLabels_Tilemap, c, r7, 8 - c, 2); + sub_809D104(a, 12 - c, 10, gBagScreenLabels_Tilemap, 0, r2, c, 2); } } -- cgit v1.2.3