Merge branch 'master' of https://github.com/pret/pokeruby into assert

1 files changed, 14 insertions, 13 deletions

diff --git a/ld_script.txt b/ld_script.txt
index 67c259177..ffd43f3fb 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -309,24 +309,25 @@ SECTIONS {
         src/battle/anim/swipe.o(.text);
         src/battle/anim/struggle.o(.text);
         src/battle/anim/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);
+        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);
-        asm/liquid_ball.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);