Merge branch 'master' into decompile_data

1 files changed, 15 insertions, 14 deletions

diff --git a/ld_script.txt b/ld_script.txt
index 0339b4d71..62a7bf680 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -141,7 +141,7 @@ SECTIONS {
         src/battle/battle_anim_80A7E7C.o(.text);
         src/field/item.o(.text);
         src/debug/matsuda_debug_menu.o(.text);
-        asm/contest.o(.text);
+        src/contest.o(.text);
         src/field/shop.o(.text);
         src/field/berry.o(.text);
         src/field/script_menu.o(.text);
@@ -268,24 +268,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);