berry blender merge conflicts

2017-11-19 22:58:13 +01:00
parent a3b5af17ea 5dc8beb034
commit ad3a97e178
16 changed files with 1777 additions and 2892 deletions
@@ -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);