diff options
| -rw-r--r-- | data/option_menu.s | 13 | ||||
| -rw-r--r-- | ld_script.txt | 2 | ||||
| -rw-r--r-- | src/option_menu.c | 5 |
3 files changed, 4 insertions, 16 deletions
diff --git a/data/option_menu.s b/data/option_menu.s deleted file mode 100644 index cb517cc89..000000000 --- a/data/option_menu.s +++ /dev/null @@ -1,13 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -gUnknown_0839F5FC:: @ 839F5FC - .incbin "graphics/misc/option_menu_text.gbapal" - -@ note: this is only used in the Japanese release - .align 2 -gUnknown_0839F63C:: @ 839F63C - .incbin "graphics/misc/option_menu_equals_sign.4bpp" diff --git a/ld_script.txt b/ld_script.txt index 2aed43e78..5e360e4eb 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -387,7 +387,7 @@ SECTIONS { data/wild_encounter.o(.rodata); src/field_effect.o(.rodata); data/pokemon_menu.o(.rodata); - data/option_menu.o(.rodata); + src/option_menu.o(.rodata); src/pokedex.o(.rodata); src/trainer_card.o(.rodata); data/trainer_card.o(.rodata); diff --git a/src/option_menu.c b/src/option_menu.c index 2463b11c6..7f8d76528 100644 --- a/src/option_menu.c +++ b/src/option_menu.c @@ -32,8 +32,9 @@ enum { MENUITEM_CANCEL, }; -extern u8 gUnknown_0839F63C[]; -extern u8 gUnknown_0839F5FC[]; //palette +const u16 gUnknown_0839F5FC[] = INCBIN_U16("graphics/misc/option_menu_text.gbapal"); +// note: this is only used in the Japanese release +const u8 gUnknown_0839F63C[] = INCBIN_U8("graphics/misc/option_menu_equals_sign.4bpp"); static void Task_OptionMenuFadeIn(u8 taskId); static void Task_OptionMenuProcessInput(u8 taskId); |