Merge branch 'master' into pokeblock

1 files changed, 1 insertions, 2 deletions

diff --git a/ld_script.txt b/ld_script.txt
index c12d7a39a..737d9eadd 100755
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -219,7 +219,6 @@ SECTIONS {
         src/birch_pc.o(.text);
         src/hof_pc.o(.text);
         src/field_specials.o(.text);
-        asm/field_specials.o(.text);
         asm/battle_records.o(.text);
         src/battle_records.o(.text);
         asm/battle_records.o(.text_8110494);
@@ -441,7 +440,7 @@ SECTIONS {
         src/pokeblock.o(.rodata);
         data/fldeff_flash.o(.rodata);
         src/time_events.o(.rodata);
-        data/field_specials.o(.rodata);
+        src/field_specials.o(.rodata);
         data/pokedex_area_screen.o(.rodata);
         data/evolution_scene.o(.rodata);
         data/roulette.o(.rodata);