Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_item_menu

1 files changed, 6 insertions, 6 deletions

diff --git a/ld_script.txt b/ld_script.txt
index 6613ca18f..8e7d996d9 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -97,15 +97,15 @@ SECTIONS {
         asm/field_player_avatar.o(.text);
         src/field_map_obj.o(.text);
         asm/field_ground_effect.o(.text);
-        asm/map_obj_8097404.o(.text);
-        asm/field_message_box.o(.text);
+        src/field_map_obj_helpers.o(.text);
+        src/field_message_box.o(.text);
         asm/map_obj_lock.o(.text);
         src/text_window.o(.text);
         src/script.o(.text);
         src/scrcmd.o(.text);
         asm/field_control_avatar.o(.text);
         src/event_data.o(.text);
-        asm/coord_event_weather.o(.text);
+        src/coord_event_weather.o(.text);
         asm/field_tasks.o(.text);
         src/clock.o(.text);
         asm/reset_rtc_screen.o(.text);
@@ -230,7 +230,7 @@ SECTIONS {
         src/lottery_corner.o(.text);
         src/diploma.o(.text);
         asm/berry_tag_screen.o(.text);
-        asm/mystery_event_menu.o(.text);
+        src/mystery_event_menu.o(.text);
         src/save_failed_screen.o(.text);
         src/braille_puzzles.o(.text);
         src/pokeblock_feed.o(.text);
@@ -408,7 +408,7 @@ SECTIONS {
         data/map_obj_8097404.o(.rodata);
         src/text_window.o(.rodata);
         src/scrcmd.o(.rodata);
-        data/coord_event_weather.o(.rodata);
+        src/coord_event_weather.o(.rodata);
         data/field_tasks.o(.rodata);
         data/reset_rtc_screen.o(.rodata);
         src/start_menu.o(.rodata);
@@ -506,7 +506,7 @@ SECTIONS {
         src/diploma.o(.rodata);
         data/strings.o(.rodata);
         data/berry_tag_screen.o(.rodata);
-        data/mystery_event_menu.o(.rodata);
+        src/mystery_event_menu.o(.rodata);
         src/save_failed_screen.o(.rodata);
         data/braille_puzzles.o(.rodata);
         src/pokeblock_feed.o(.rodata);