fix merge conflicts

1 files changed, 19 insertions, 18 deletions

diff --git a/ld_script.txt b/ld_script.txt
index c4e5b9fd6..07334bd2c 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -264,28 +264,29 @@ SECTIONS {
         src/battle/anim/perceive.o(.text);
         src/battle/anim/angel.o(.text);
         src/battle/anim/angel_kiss.o(.text);
-        asm/devil.o(.text);
-        asm/swipe.o(.text);
-        asm/struggle.o(.text);
-        asm/uproar.o(.text);
-        asm/noise.o(.text);
-        asm/note_spin.o(.text);
-        asm/guard.o(.text);
-        asm/fury_cutter_count.o(.text);
-        asm/rain.o(.text);
-        asm/bubble.o(.text);
-        asm/aurora.o(.text);
-        asm/liquid_ball.o(.text);
+        src/battle/anim/devil.o(.text);
+        src/battle/anim/swipe.o(.text);
+        src/battle/anim/struggle.o(.text);
+        src/battle/anim/uproar.o(.text);
+        src/battle/anim/noise.o(.text);
+        src/battle/anim/note_spin.o(.text);
+        src/battle/anim/guard.o(.text);
+        src/battle/anim/fury_cutter_count.o(.text);
+        src/battle/anim/rain.o(.text);
+        src/battle/anim/bubble.o(.text);
+        src/battle/anim/aurora.o(.text);
+        src/battle/anim/energy_wave.o(.text);
+        src/battle/anim/water.o(.text);
         asm/water.o(.text);
         asm/fire.o(.text);
-        asm/sunlight.o(.text);
+        src/battle/anim/sunlight.o(.text);
         asm/fire_2.o(.text);
-        asm/heated_rock.o(.text);
-        asm/wisp_orb.o(.text);
+        src/battle/anim/heated_rock.o(.text);
+        src/battle/anim/wisp_orb.o(.text);
         asm/wisp_fire.o(.text);
-        asm/thunder.o(.text);
-        asm/beta_beat_up.o(.text);
-        asm/shock.o(.text);
+        src/battle/anim/thunder.o(.text);
+        src/battle/anim/beta_beat_up.o(.text);
+        src/battle/anim/shock.o(.text);
         asm/current.o(.text);
         asm/ice.o(.text);
         asm/fight.o(.text);