Merge branch 'master' into battle_anim

1 files changed, 4 insertions, 2 deletions

diff --git a/ld_script.txt b/ld_script.txt
index 2a7164635..125d288cf 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -303,8 +303,8 @@ SECTIONS {
         asm/normal.o(.text);
         asm/battle_intro.o(.text);
         src/field/bike.o(.text);
-        asm/easy_chat.o(.text);
-        src/field/easy_chat.o(.text);
+        src/easy_chat_1.o(.text);
+        src/easy_chat_2.o(.text);
         src/pokenav_before.o(.text);
         asm/pokenav.o(.text);
         src/pokenav_after.o(.text);
@@ -542,6 +542,8 @@ SECTIONS {
         src/field/item_use.o(.rodata);
         data/battle_anim_80CA710.o(.rodata);
         src/field/bike.o(.rodata);
+        src/easy_chat_1.o(.rodata);
+        src/easy_chat_2.o(.rodata);
         data/easy_chat.o(.rodata);
         data/pokenav.o(.rodata);
         src/pokemon/mon_markings.o(.rodata);