Merge branch 'master' into trainer_tower

1 files changed, 6 insertions, 2 deletions

diff --git a/ld_script.txt b/ld_script.txt
index 8d188156b..7d2adefe7 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -91,7 +91,7 @@ SECTIONS {
         asm/play_time.o(.text);
         asm/new_game.o(.text);
         asm/overworld.o(.text);
-        asm/fieldmap.o(.text);
+        src/fieldmap.o(.text);
         src/metatile_behavior.o(.text);
         asm/field_camera.o(.text);
         asm/field_door.o(.text);
@@ -103,7 +103,7 @@ SECTIONS {
         asm/map_obj_lock.o(.text);
         asm/text_window_graphics.o(.text);
         src/script.o(.text);
-        asm/scrcmd.o(.text);
+        src/scrcmd.o(.text);
         asm/field_control_avatar.o(.text);
         asm/event_data.o(.text);
         asm/coord_event_weather.o(.text);
@@ -367,9 +367,13 @@ SECTIONS {
         src/bg_regs.o(.rodata);
         src/string_util.o(.rodata);
         data/data.o(.rodata);
+        data/fieldmap.o(.rodata);
+        src/fieldmap.o(.rodata);
         src/metatile_behavior.o(.rodata);
         data/metatile_behavior.o(.rodata);
         data/data_835B488.o(.rodata);
+        src/scrcmd.o(.rodata);
+        data/data_835B488.o(.rodata.83A72A0);
         src/battle_ai_script_commands.o(.rodata);
         data/data_83F5738.o(.rodata);
         src/save.o(.rodata);