merge with master, fix conflicts

1 files changed, 4 insertions, 2 deletions

diff --git a/ld_script.txt b/ld_script.txt
index 86bd92c7c..df92d5d39 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -54,7 +54,7 @@ SECTIONS {
         asm/link.o(.text);
         src/rtc.o(.text);
         asm/main_menu.o(.text);
-        asm/rom3.o(.text);
+        src/battle_controllers.o(.text);
         src/decompress.o(.text);
         asm/battle_1.o(.text);
         src/battle_2.o(.text);
@@ -113,7 +113,7 @@ SECTIONS {
         src/tileset_anims.o(.text);
         src/palette.o(.text);
         src/sound.o(.text);
-        asm/battle_anim.o(.text);
+        src/battle_anim.o(.text);
         asm/rom_80A5C6C.o(.text);
         src/task.o(.text);
         src/reshow_battle_screen.o(.text);
@@ -364,6 +364,8 @@ SECTIONS {
         src/palette.o(.rodata);
         data/fanfares.o(.rodata);
         data/battle_anims.o(.rodata);
+        src/battle_anim.o(.rodata);
+        data/rom_8525F58.o(.rodata);
         data/title_screen.o(.rodata);
         data/field_screen.o(.rodata);
         data/battle_setup.o(.rodata);