Merge branch 'master' into battle

1 files changed, 2 insertions, 1 deletions

diff --git a/ld_script.txt b/ld_script.txt
index c1d781e0a..fd8ea9c6c 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -187,7 +187,7 @@ SECTIONS {
         asm/post_battle_event_funcs.o(.text);
         src/prof_pc.o(.text);
         src/hof_pc.o(.text);
-        asm/field_specials.o(.text);
+        src/field_specials.o(.text);
         src/battle_records.o(.text);
         asm/evolution_scene.o(.text);
         src/coins.o(.text);
@@ -448,6 +448,7 @@ SECTIONS {
         data/data_835B488.o(.rodata.83EEC98);
         src/battle_ai_script_commands.o(.rodata);
         data/data_83F5738.o(.rodata);
+        src/field_specials.o(.rodata);
         src/battle_records.o(.rodata);
         data/data_83F5738.o(.rodata.83F6C90);
         src/battle_transition.o(.rodata);