Merge branch 'master' into quest_log

1 files changed, 6 insertions, 4 deletions

diff --git a/ld_script.txt b/ld_script.txt
index 4ef96aae7..5ac1bdeaa 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -181,7 +181,7 @@ SECTIONS {
         asm/math_util.o(.text);
         asm/roulette_util.o(.text);
         asm/cable_car_util.o(.text);
-        asm/save.o(.text);
+        src/save.o(.text);
         asm/mystery_event_script.o(.text);
         asm/field_effect_helpers.o(.text);
         asm/battle_anim_sound_tasks.o(.text);
@@ -366,12 +366,14 @@ SECTIONS {
         src/string_util.o(.rodata);
         data/data.o(.rodata);
         src/battle_ai_script_commands.o(.rodata);
-        data/data_84827AC.o(.rodata);
+        data/data_83F5738.o(.rodata);
+        src/save.o(.rodata);
+        data/data_83FECCC.o(.rodata);
         src/quest_log.o(.rodata);
         data/quest_log.o(.rodata);
-        data/data_84827AC.o(.rodata.8456C74);
+        data/data_83FECCC.o(.rodata.8456C74);
         src/menews_jisan.o(.rodata);
-        data/data_84827AC.o(.rodata.8468C98);
+        data/data_8468C98.o(.rodata);
         src/m4a_tables.o(.rodata);
         data/sound_data.o(.rodata);
     } =0