Merge branch 'master' into data_dump

1 files changed, 2 insertions, 1 deletions

diff --git a/ld_script.txt b/ld_script.txt
index 48dca5e1a..aa9da405e 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -175,7 +175,7 @@ SECTIONS {
         asm/bike.o(.text);
         asm/easy_chat.o(.text);
         asm/mon_markings.o(.text);
-        asm/mail.o(.text);
+        src/mail.o(.text);
         src/menu_helpers.o(.text);
         asm/script_pokemon_util_80BF8FC.o(.text);
         src/heal_location.o(.text);
@@ -436,6 +436,7 @@ SECTIONS {
         src/battle_anim_utility_funcs.o(.rodata);
         src/battle_intro.o(.rodata);
         data/data_835B488.o(.rodata.83E7CFC);
+        src/mail.o(.rodata);
         src/heal_location.o(.rodata);
         data/data_835B488.o(.rodata.83EEC98);
         src/battle_ai_script_commands.o(.rodata);