Merge branch 'master' into mauville_old_man

1 files changed, 2 insertions, 2 deletions

diff --git a/ld_script.txt b/ld_script.txt
index 3abdcc5e0..5d6f0db7b 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -87,7 +87,7 @@ SECTIONS {
         src/play_time.o(.text);
         src/new_game.o(.text);
         src/overworld.o(.text);
-        asm/fieldmap.o(.text);
+        src/fieldmap.o(.text);
         src/metatile_behavior.o(.text);
         src/field_camera.o(.text);
         src/field_door.o(.text);
@@ -395,7 +395,7 @@ SECTIONS {
         src/overworld.o(.rodata);
         data/tilesets.o(.rodata);
         data/maps.o(.rodata);
-        data/fieldmap.o(.rodata);
+        src/fieldmap.o(.rodata);
         src/metatile_behavior.o(.rodata);
         src/field_door.o(.rodata);
         data/field_player_avatar.o(.rodata);