berry blender merge conflicts

ld_script.txt

@@ -231,7 +231,7 @@ SECTIONS {
         asm/fldeff_teleport.o(.text);
         asm/battle_link_817C95C.o(.text);
         asm/pokemon_animation.o(.text);
-        asm/recorded_battle.o(.text);
+        src/recorded_battle.o(.text);
         src/battle_controller_recorded_opponent.o(.text);
         src/battle_controller_recorded_player.o(.text);
         src/battle_dome_cards.o(.text);