Merge branch 'master' into battle_records

1 files changed, 2 insertions, 1 deletions

diff --git a/ld_script.txt b/ld_script.txt
index 55cb9d316..bf6ddadc4 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -234,7 +234,7 @@ SECTIONS {
         src/vs_seeker.o(.text);
         src/item_pc.o(.text);
         asm/mailbox_pc.o(.text);
-        asm/menu.o(.text);
+        src/menu.o(.text);
         src/quest_log.o(.text);
         asm/link_rfu_3.o(.text);
         asm/pokemon_special_anim.o(.text);
@@ -435,6 +435,7 @@ SECTIONS {
         src/vs_seeker.o(.rodata);
         src/item_pc.o(.rodata);
         data/data_83FECCC.o(.rodata.8453F6C);
+        src/menu.o(.rodata);
         src/quest_log.o(.rodata);
         data/data_83FECCC.o(.rodata.8456C74);
         src/help_system_812B1E0.o(.rodata);