fix PR merge conflicts

ld_script.txt

@@ -190,7 +190,7 @@ SECTIONS {
         src/hof_pc.o(.text);
         src/field_specials.o(.text);
         src/battle_records.o(.text);
-        asm/evolution_scene.o(.text);
+        src/evolution_scene.o(.text);
         src/coins.o(.text);
         src/fldeff_strength.o(.text);
         src/battle_transition.o(.text);
@@ -474,7 +474,7 @@ SECTIONS {
         data/fldeff_flash.o(.rodata);
         src/field_specials.o(.rodata);
         src/battle_records.o(.rodata);
-        data/evolution_scene.o(.rodata);
+        src/evolution_scene.o(.rodata);
         src/battle_transition.o(.rodata);
         src/battle_controller_link_partner.o(.rodata);
         data/battle_message.o(.rodata);