diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-07-29 07:59:32 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-29 07:59:32 -0500 |
| commit | d99b457ce5e77a65cc49e8b03e9fae563756b207 (patch) | |
| tree | 694f23be9250507bab593823594aa1efe6f766d5 | |
| parent | 1a378c07c6f95a6805d96852e55e3847e32c03b5 (diff) | |
| parent | c77da88c92ca9f5f35f15a8556baa78ce3be5631 (diff) | |
Merge pull request #663 from hiddenruby/master
gUnknown_08E77004 named moved into interface, and fixed typo in Makefile
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | data/graphics.s | 4 | ||||
| -rw-r--r-- | graphics/interface/bag_screen.bin (renamed from graphics/unknown/unknown_E77004.bin) | bin | 2048 -> 2048 bytes | |||
| -rw-r--r-- | include/graphics.h | 2 | ||||
| -rw-r--r-- | src/item_menu.c | 4 |
5 files changed, 6 insertions, 6 deletions
@@ -64,7 +64,7 @@ LD_SCRIPT := $(BUILD_DIR)/ld_script.ld #### Main Rules #### -ALL_BUILDS := ruby ruby_rev1 ruby_rev1 sapphire sapphire_rev1 sapphire_rev2 ruby_de sapphire_de ruby_de_debug +ALL_BUILDS := ruby ruby_rev1 ruby_rev2 sapphire sapphire_rev1 sapphire_rev2 ruby_de sapphire_de ruby_de_debug # Available targets .PHONY: all clean tidy tools $(ALL_BUILDS) diff --git a/data/graphics.s b/data/graphics.s index 7970dc904..f48723501 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -3225,8 +3225,8 @@ gBagScreenMale_Pal:: @ 8E76F94 gBagScreenFemale_Pal:: @ 8E76FCC .incbin "graphics/interface/bag_screen_female.gbapal.lz" -gUnknown_08E77004:: @ 8E77004 - .incbin "graphics/unknown/unknown_E77004.bin" +gBagScreen_Tilemap:: @ 8E77004 + .incbin "graphics/interface/bag_screen.bin" .align 2 gBuyMenuFrame_Gfx:: @ 8E77804 diff --git a/graphics/unknown/unknown_E77004.bin b/graphics/interface/bag_screen.bin Binary files differindex 0342aac39..0342aac39 100644 --- a/graphics/unknown/unknown_E77004.bin +++ b/graphics/interface/bag_screen.bin diff --git a/include/graphics.h b/include/graphics.h index 8e8e0c97e..d9390e1b6 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -2472,7 +2472,7 @@ extern const u8 gBagPalette[]; extern const u8 gBagScreen_Gfx[]; extern const u8 gBagScreenMale_Pal[]; extern const u8 gBagScreenFemale_Pal[]; -extern const u16 gUnknown_08E77004[]; +extern const u16 gBagScreen_Tilemap[]; extern const u8 gBuyMenuFrame_Gfx[]; extern const u8 gMenuMoneyPal[]; extern const u8 gBuyMenuFrame_Tilemap[]; diff --git a/src/item_menu.c b/src/item_menu.c index 71516c0a4..915aa5183 100644 --- a/src/item_menu.c +++ b/src/item_menu.c @@ -538,7 +538,7 @@ static bool8 LoadBagGraphicsMultistep(void) ewramBagSetupStep++; break; case 1: - CpuCopy16(gUnknown_08E77004, gBGTilemapBuffers[2], 0x800); + CpuCopy16(gBagScreen_Tilemap, gBGTilemapBuffers[2], 0x800); ewramBagSetupStep++; break; case 2: @@ -742,7 +742,7 @@ static void sub_80A37F8(u8 taskId) static void sub_80A3954(u16 *a) { - CpuCopy16(gUnknown_08E77004, a, 0x800); + CpuCopy16(gBagScreen_Tilemap, a, 0x800); } static void sub_80A396C(u16 *a, u8 b, u8 c, u8 d) |