summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile4
-rw-r--r--ld_script.txt188
-rwxr-xr-xsrc/battle/anim/alert.c (renamed from src/anim/alert.c)0
-rwxr-xr-xsrc/battle/anim/angel.c (renamed from src/anim/angel.c)0
-rwxr-xr-xsrc/battle/anim/angel_kiss.c (renamed from src/anim/angel_kiss.c)0
-rwxr-xr-xsrc/battle/anim/anger.c (renamed from src/anim/anger.c)0
-rwxr-xr-xsrc/battle/anim/blow_kiss.c (renamed from src/anim/blow_kiss.c)0
-rwxr-xr-xsrc/battle/anim/bottle.c (renamed from src/anim/bottle.c)0
-rwxr-xr-xsrc/battle/anim/brace.c (renamed from src/anim/brace.c)0
-rwxr-xr-xsrc/battle/anim/breath.c (renamed from src/anim/breath.c)0
-rwxr-xr-xsrc/battle/anim/bullet.c (renamed from src/anim/bullet.c)0
-rwxr-xr-xsrc/battle/anim/copy_orb.c (renamed from src/anim/copy_orb.c)0
-rwxr-xr-xsrc/battle/anim/cube.c (renamed from src/anim/cube.c)0
-rwxr-xr-xsrc/battle/anim/curtain.c (renamed from src/anim/curtain.c)0
-rwxr-xr-xsrc/battle/anim/cutter.c (renamed from src/anim/cutter.c)0
-rwxr-xr-xsrc/battle/anim/cyclone.c (renamed from src/anim/cyclone.c)0
-rwxr-xr-xsrc/battle/anim/draw.c (renamed from src/anim/draw.c)0
-rwxr-xr-xsrc/battle/anim/drum.c (renamed from src/anim/drum.c)0
-rwxr-xr-xsrc/battle/anim/egg.c (renamed from src/anim/egg.c)0
-rwxr-xr-xsrc/battle/anim/espeed.c (renamed from src/anim/espeed.c)0
-rwxr-xr-xsrc/battle/anim/evasion.c (renamed from src/anim/evasion.c)0
-rwxr-xr-xsrc/battle/anim/fang.c (renamed from src/anim/fang.c)0
-rwxr-xr-xsrc/battle/anim/flash.c (renamed from src/anim/flash.c)0
-rwxr-xr-xsrc/battle/anim/flying_hearts.c (renamed from src/anim/flying_hearts.c)0
-rwxr-xr-xsrc/battle/anim/flying_path.c (renamed from src/anim/flying_path.c)0
-rwxr-xr-xsrc/battle/anim/flying_petals.c (renamed from src/anim/flying_petals.c)0
-rwxr-xr-xsrc/battle/anim/glitter.c (renamed from src/anim/glitter.c)0
-rwxr-xr-xsrc/battle/anim/glow.c (renamed from src/anim/glow.c)0
-rwxr-xr-xsrc/battle/anim/grip.c (renamed from src/anim/grip.c)0
-rwxr-xr-xsrc/battle/anim/grow.c (renamed from src/anim/grow.c)0
-rwxr-xr-xsrc/battle/anim/guillotine.c (renamed from src/anim/guillotine.c)0
-rwxr-xr-xsrc/battle/anim/heal.c (renamed from src/anim/heal.c)0
-rwxr-xr-xsrc/battle/anim/heart_1.c (renamed from src/anim/heart_1.c)0
-rwxr-xr-xsrc/battle/anim/homing.c (renamed from src/anim/homing.c)0
-rwxr-xr-xsrc/battle/anim/hop.c (renamed from src/anim/hop.c)0
-rwxr-xr-xsrc/battle/anim/hop_2.c (renamed from src/anim/hop_2.c)0
-rwxr-xr-xsrc/battle/anim/kiss_fountain.c (renamed from src/anim/kiss_fountain.c)0
-rwxr-xr-xsrc/battle/anim/leaf.c (renamed from src/anim/leaf.c)0
-rwxr-xr-xsrc/battle/anim/love_bg.c (renamed from src/anim/love_bg.c)0
-rwxr-xr-xsrc/battle/anim/lunge_1.c (renamed from src/anim/lunge_1.c)0
-rwxr-xr-xsrc/battle/anim/lunge_2.c (renamed from src/anim/lunge_2.c)0
-rwxr-xr-xsrc/battle/anim/money.c (renamed from src/anim/money.c)0
-rwxr-xr-xsrc/battle/anim/moon.c (renamed from src/anim/moon.c)0
-rwxr-xr-xsrc/battle/anim/note_rain.c (renamed from src/anim/note_rain.c)0
-rwxr-xr-xsrc/battle/anim/note_scatter.c (renamed from src/anim/note_scatter.c)0
-rwxr-xr-xsrc/battle/anim/note_scatter_2.c (renamed from src/anim/note_scatter_2.c)0
-rwxr-xr-xsrc/battle/anim/note_wave.c (renamed from src/anim/note_wave.c)0
-rwxr-xr-xsrc/battle/anim/orbit.c (renamed from src/anim/orbit.c)0
-rwxr-xr-xsrc/battle/anim/orbit_fast.c (renamed from src/anim/orbit_fast.c)0
-rwxr-xr-xsrc/battle/anim/orbit_scatter.c (renamed from src/anim/orbit_scatter.c)0
-rwxr-xr-xsrc/battle/anim/orbs.c (renamed from src/anim/orbs.c)0
-rwxr-xr-xsrc/battle/anim/osmose.c (renamed from src/anim/osmose.c)0
-rwxr-xr-xsrc/battle/anim/perceive.c (renamed from src/anim/perceive.c)0
-rwxr-xr-xsrc/battle/anim/powder.c (renamed from src/anim/powder.c)0
-rwxr-xr-xsrc/battle/anim/ring.c (renamed from src/anim/ring.c)0
-rwxr-xr-xsrc/battle/anim/roots.c (renamed from src/anim/roots.c)0
-rwxr-xr-xsrc/battle/anim/scan.c (renamed from src/anim/scan.c)0
-rwxr-xr-xsrc/battle/anim/scary_face.c (renamed from src/anim/scary_face.c)0
-rwxr-xr-xsrc/battle/anim/seed.c (renamed from src/anim/seed.c)0
-rwxr-xr-xsrc/battle/anim/shadow_enlarge.c (renamed from src/anim/shadow_enlarge.c)0
-rwxr-xr-xsrc/battle/anim/shadow_minimize.c (renamed from src/anim/shadow_minimize.c)0
-rwxr-xr-xsrc/battle/anim/shield.c (renamed from src/anim/shield.c)0
-rwxr-xr-xsrc/battle/anim/shimmer.c (renamed from src/anim/shimmer.c)0
-rwxr-xr-xsrc/battle/anim/silhouette.c (renamed from src/anim/silhouette.c)0
-rwxr-xr-xsrc/battle/anim/slash.c (renamed from src/anim/slash.c)0
-rwxr-xr-xsrc/battle/anim/sleep.c (renamed from src/anim/sleep.c)0
-rwxr-xr-xsrc/battle/anim/slice.c (renamed from src/anim/slice.c)0
-rwxr-xr-xsrc/battle/anim/smoke.c (renamed from src/anim/smoke.c)0
-rwxr-xr-xsrc/battle/anim/sonic.c (renamed from src/anim/sonic.c)0
-rwxr-xr-xsrc/battle/anim/sonic_task.c (renamed from src/anim/sonic_task.c)0
-rwxr-xr-xsrc/battle/anim/spin_finger.c (renamed from src/anim/spin_finger.c)0
-rwxr-xr-xsrc/battle/anim/spit.c (renamed from src/anim/spit.c)0
-rwxr-xr-xsrc/battle/anim/splash.c (renamed from src/anim/splash.c)0
-rwxr-xr-xsrc/battle/anim/startle.c (renamed from src/anim/startle.c)0
-rwxr-xr-xsrc/battle/anim/strike.c (renamed from src/anim/strike.c)0
-rwxr-xr-xsrc/battle/anim/switch.c (renamed from src/anim/switch.c)0
-rwxr-xr-xsrc/battle/anim/sword.c (renamed from src/anim/sword.c)0
-rwxr-xr-xsrc/battle/anim/taunt_finger.c (renamed from src/anim/taunt_finger.c)0
-rwxr-xr-xsrc/battle/anim/tendrils.c (renamed from src/anim/tendrils.c)0
-rwxr-xr-xsrc/battle/anim/thought.c (renamed from src/anim/thought.c)0
-rwxr-xr-xsrc/battle/anim/thrashing.c (renamed from src/anim/thrashing.c)0
-rwxr-xr-xsrc/battle/anim/tile_in.c (renamed from src/anim/tile_in.c)0
-rwxr-xr-xsrc/battle/anim/tile_out.c (renamed from src/anim/tile_out.c)0
-rwxr-xr-xsrc/battle/anim/twinkle.c (renamed from src/anim/twinkle.c)0
-rwxr-xr-xsrc/battle/anim/unused_1.c (renamed from src/anim/unused_1.c)0
-rwxr-xr-xsrc/battle/anim/unused_2.c (renamed from src/anim/unused_2.c)0
-rwxr-xr-xsrc/battle/anim/unused_3.c (renamed from src/anim/unused_3.c)0
-rwxr-xr-xsrc/battle/anim/unused_4.c (renamed from src/anim/unused_4.c)0
-rwxr-xr-xsrc/battle/anim/unused_5.c (renamed from src/anim/unused_5.c)0
-rwxr-xr-xsrc/battle/anim/unused_6.c (renamed from src/anim/unused_6.c)0
-rwxr-xr-xsrc/battle/anim/unused_7.c (renamed from src/anim/unused_7.c)0
-rwxr-xr-xsrc/battle/anim/unused_8.c (renamed from src/anim/unused_8.c)0
-rwxr-xr-xsrc/battle/anim/unused_9.c (renamed from src/anim/unused_9.c)0
-rwxr-xr-xsrc/battle/anim/wave_finger.c (renamed from src/anim/wave_finger.c)0
-rwxr-xr-xsrc/battle/anim/whip.c (renamed from src/anim/whip.c)0
-rwxr-xr-xsrc/battle/anim/withdraw.c (renamed from src/anim/withdraw.c)0
96 files changed, 96 insertions, 96 deletions
diff --git a/Makefile b/Makefile
index f48a5dff2..2e430c2e6 100644
--- a/Makefile
+++ b/Makefile
@@ -40,9 +40,9 @@ VERSIONS := ruby sapphire ruby_rev1 sapphire_rev1 ruby_rev2 sapphire_rev2 ruby_d
$(VERSIONS) $(VERSIONS:%=compare_%)
-$(shell mkdir -p build/ $(VERSIONS:%=build/%/{,asm,data,src{,/battle,/field,/debug,/scene,/pokemon,/engine,/libs,/anim}}))
+$(shell mkdir -p build/ $(VERSIONS:%=build/%/{,asm,data,src{,/battle{,/anim},/field,/debug,/scene,/pokemon,/engine,/libs,/anim}}))
-C_SRCS := $(wildcard src/*/*.c) $(wildcard src/*.c)
+C_SRCS := $(shell find src -iname "*.c")
ASM_SRCS := $(wildcard asm/*.s)
DATA_ASM_SRCS := $(wildcard data/*.s)
diff --git a/ld_script.txt b/ld_script.txt
index 4ff52a41e..936a5eed1 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -172,100 +172,100 @@ SECTIONS {
asm/contest_link_80C857C.o(.text);
src/battle/contest_link_80C857C.o(.text);
src/field/item_use.o(.text);
- src/anim/powder.o(.text);
- src/anim/orbs.o(.text);
- src/anim/seed.o(.text);
- src/anim/orbit.o(.text);
- src/anim/leaf.o(.text);
- src/anim/cutter.o(.text);
- src/anim/tendrils.o(.text);
- src/anim/silhouette.o(.text);
- src/anim/copy_orb.o(.text);
- src/anim/roots.o(.text);
- src/anim/osmose.o(.text);
- src/anim/hop.o(.text);
- src/anim/heal.o(.text);
- src/anim/hop_2.o(.text);
- src/anim/switch.o(.text);
- src/anim/flying_path.o(.text);
- src/anim/flying_petals.o(.text);
- src/anim/shimmer.o(.text);
- src/anim/homing.o(.text);
- src/anim/whip.o(.text);
- src/anim/unused_1.o(.text);
- src/anim/slice.o(.text);
- src/anim/unused_2.o(.text);
- src/anim/shield.o(.text);
- src/anim/bottle.o(.text);
- src/anim/glitter.o(.text);
- src/anim/unused_3.o(.text);
- src/anim/sleep.o(.text);
- src/anim/scan.o(.text);
- src/anim/lunge_1.o(.text);
- src/anim/unused_4.o(.text);
- src/anim/lunge_2.o(.text);
- src/anim/slash.o(.text);
- src/anim/brace.o(.text);
- src/anim/cube.o(.text);
- src/anim/tile_in.o(.text);
- src/anim/tile_out.o(.text);
- src/anim/moon.o(.text);
- src/anim/twinkle.o(.text);
- src/anim/flash.o(.text);
- src/anim/strike.o(.text);
- src/anim/evasion.o(.text);
- src/anim/fang.o(.text);
- src/anim/note_wave.o(.text);
- src/anim/note_scatter.o(.text);
- src/anim/drum.o(.text);
- src/anim/note_scatter_2.o(.text);
- src/anim/thought.o(.text);
- src/anim/wave_finger.o(.text);
- src/anim/spin_finger.o(.text);
- src/anim/taunt_finger.o(.text);
- src/anim/unused_5.o(.text);
- src/anim/unused_6.o(.text);
- src/anim/unused_7.o(.text);
- src/anim/unused_8.o(.text);
- src/anim/withdraw.o(.text);
- src/anim/alert.o(.text);
- src/anim/sword.o(.text);
- src/anim/sonic.o(.text);
- src/anim/sonic_task.o(.text);
- src/anim/unused_9.o(.text);
- src/anim/money.o(.text);
- src/anim/bullet.o(.text);
- src/anim/cyclone.o(.text);
- src/anim/grip.o(.text);
- src/anim/guillotine.o(.text);
- src/anim/shadow_enlarge.o(.text);
- src/anim/shadow_minimize.o(.text);
- src/anim/splash.o(.text);
- src/anim/grow.o(.text);
- src/anim/breath.o(.text);
- src/anim/anger.o(.text);
- src/anim/thrashing.o(.text);
- src/anim/draw.o(.text);
- src/anim/ring.o(.text);
- src/anim/egg.o(.text);
- src/anim/espeed.o(.text);
- src/anim/smoke.o(.text);
- src/anim/glow.o(.text);
- src/anim/note_rain.o(.text);
- src/anim/heart_1.o(.text);
- src/anim/curtain.o(.text);
- src/anim/startle.o(.text);
- src/anim/blow_kiss.o(.text);
- src/anim/kiss_fountain.o(.text);
- src/anim/flying_hearts.o(.text);
- src/anim/love_bg.o(.text);
- src/anim/scary_face.o(.text);
- src/anim/orbit_fast.o(.text);
- src/anim/orbit_scatter.o(.text);
- src/anim/spit.o(.text);
- src/anim/perceive.o(.text);
- src/anim/angel.o(.text);
- src/anim/angel_kiss.o(.text);
+ src/battle/anim/powder.o(.text);
+ src/battle/anim/orbs.o(.text);
+ src/battle/anim/seed.o(.text);
+ src/battle/anim/orbit.o(.text);
+ src/battle/anim/leaf.o(.text);
+ src/battle/anim/cutter.o(.text);
+ src/battle/anim/tendrils.o(.text);
+ src/battle/anim/silhouette.o(.text);
+ src/battle/anim/copy_orb.o(.text);
+ src/battle/anim/roots.o(.text);
+ src/battle/anim/osmose.o(.text);
+ src/battle/anim/hop.o(.text);
+ src/battle/anim/heal.o(.text);
+ src/battle/anim/hop_2.o(.text);
+ src/battle/anim/switch.o(.text);
+ src/battle/anim/flying_path.o(.text);
+ src/battle/anim/flying_petals.o(.text);
+ src/battle/anim/shimmer.o(.text);
+ src/battle/anim/homing.o(.text);
+ src/battle/anim/whip.o(.text);
+ src/battle/anim/unused_1.o(.text);
+ src/battle/anim/slice.o(.text);
+ src/battle/anim/unused_2.o(.text);
+ src/battle/anim/shield.o(.text);
+ src/battle/anim/bottle.o(.text);
+ src/battle/anim/glitter.o(.text);
+ src/battle/anim/unused_3.o(.text);
+ src/battle/anim/sleep.o(.text);
+ src/battle/anim/scan.o(.text);
+ src/battle/anim/lunge_1.o(.text);
+ src/battle/anim/unused_4.o(.text);
+ src/battle/anim/lunge_2.o(.text);
+ src/battle/anim/slash.o(.text);
+ src/battle/anim/brace.o(.text);
+ src/battle/anim/cube.o(.text);
+ src/battle/anim/tile_in.o(.text);
+ src/battle/anim/tile_out.o(.text);
+ src/battle/anim/moon.o(.text);
+ src/battle/anim/twinkle.o(.text);
+ src/battle/anim/flash.o(.text);
+ src/battle/anim/strike.o(.text);
+ src/battle/anim/evasion.o(.text);
+ src/battle/anim/fang.o(.text);
+ src/battle/anim/note_wave.o(.text);
+ src/battle/anim/note_scatter.o(.text);
+ src/battle/anim/drum.o(.text);
+ src/battle/anim/note_scatter_2.o(.text);
+ src/battle/anim/thought.o(.text);
+ src/battle/anim/wave_finger.o(.text);
+ src/battle/anim/spin_finger.o(.text);
+ src/battle/anim/taunt_finger.o(.text);
+ src/battle/anim/unused_5.o(.text);
+ src/battle/anim/unused_6.o(.text);
+ src/battle/anim/unused_7.o(.text);
+ src/battle/anim/unused_8.o(.text);
+ src/battle/anim/withdraw.o(.text);
+ src/battle/anim/alert.o(.text);
+ src/battle/anim/sword.o(.text);
+ src/battle/anim/sonic.o(.text);
+ src/battle/anim/sonic_task.o(.text);
+ src/battle/anim/unused_9.o(.text);
+ src/battle/anim/money.o(.text);
+ src/battle/anim/bullet.o(.text);
+ src/battle/anim/cyclone.o(.text);
+ src/battle/anim/grip.o(.text);
+ src/battle/anim/guillotine.o(.text);
+ src/battle/anim/shadow_enlarge.o(.text);
+ src/battle/anim/shadow_minimize.o(.text);
+ src/battle/anim/splash.o(.text);
+ src/battle/anim/grow.o(.text);
+ src/battle/anim/breath.o(.text);
+ src/battle/anim/anger.o(.text);
+ src/battle/anim/thrashing.o(.text);
+ src/battle/anim/draw.o(.text);
+ src/battle/anim/ring.o(.text);
+ src/battle/anim/egg.o(.text);
+ src/battle/anim/espeed.o(.text);
+ src/battle/anim/smoke.o(.text);
+ src/battle/anim/glow.o(.text);
+ src/battle/anim/note_rain.o(.text);
+ src/battle/anim/heart_1.o(.text);
+ src/battle/anim/curtain.o(.text);
+ src/battle/anim/startle.o(.text);
+ src/battle/anim/blow_kiss.o(.text);
+ src/battle/anim/kiss_fountain.o(.text);
+ src/battle/anim/flying_hearts.o(.text);
+ src/battle/anim/love_bg.o(.text);
+ src/battle/anim/scary_face.o(.text);
+ src/battle/anim/orbit_fast.o(.text);
+ src/battle/anim/orbit_scatter.o(.text);
+ src/battle/anim/spit.o(.text);
+ 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);
diff --git a/src/anim/alert.c b/src/battle/anim/alert.c
index 538008be0..538008be0 100755
--- a/src/anim/alert.c
+++ b/src/battle/anim/alert.c
diff --git a/src/anim/angel.c b/src/battle/anim/angel.c
index 916ebfdfd..916ebfdfd 100755
--- a/src/anim/angel.c
+++ b/src/battle/anim/angel.c
diff --git a/src/anim/angel_kiss.c b/src/battle/anim/angel_kiss.c
index 453c4d802..453c4d802 100755
--- a/src/anim/angel_kiss.c
+++ b/src/battle/anim/angel_kiss.c
diff --git a/src/anim/anger.c b/src/battle/anim/anger.c
index 8962e0855..8962e0855 100755
--- a/src/anim/anger.c
+++ b/src/battle/anim/anger.c
diff --git a/src/anim/blow_kiss.c b/src/battle/anim/blow_kiss.c
index e63f7189d..e63f7189d 100755
--- a/src/anim/blow_kiss.c
+++ b/src/battle/anim/blow_kiss.c
diff --git a/src/anim/bottle.c b/src/battle/anim/bottle.c
index ac5e51881..ac5e51881 100755
--- a/src/anim/bottle.c
+++ b/src/battle/anim/bottle.c
diff --git a/src/anim/brace.c b/src/battle/anim/brace.c
index 7b084efbb..7b084efbb 100755
--- a/src/anim/brace.c
+++ b/src/battle/anim/brace.c
diff --git a/src/anim/breath.c b/src/battle/anim/breath.c
index 0fcc7fa08..0fcc7fa08 100755
--- a/src/anim/breath.c
+++ b/src/battle/anim/breath.c
diff --git a/src/anim/bullet.c b/src/battle/anim/bullet.c
index 11306873a..11306873a 100755
--- a/src/anim/bullet.c
+++ b/src/battle/anim/bullet.c
diff --git a/src/anim/copy_orb.c b/src/battle/anim/copy_orb.c
index 96d2910f0..96d2910f0 100755
--- a/src/anim/copy_orb.c
+++ b/src/battle/anim/copy_orb.c
diff --git a/src/anim/cube.c b/src/battle/anim/cube.c
index 250e3f2d1..250e3f2d1 100755
--- a/src/anim/cube.c
+++ b/src/battle/anim/cube.c
diff --git a/src/anim/curtain.c b/src/battle/anim/curtain.c
index 1f34cb173..1f34cb173 100755
--- a/src/anim/curtain.c
+++ b/src/battle/anim/curtain.c
diff --git a/src/anim/cutter.c b/src/battle/anim/cutter.c
index 9859497e5..9859497e5 100755
--- a/src/anim/cutter.c
+++ b/src/battle/anim/cutter.c
diff --git a/src/anim/cyclone.c b/src/battle/anim/cyclone.c
index b19304f17..b19304f17 100755
--- a/src/anim/cyclone.c
+++ b/src/battle/anim/cyclone.c
diff --git a/src/anim/draw.c b/src/battle/anim/draw.c
index c075af097..c075af097 100755
--- a/src/anim/draw.c
+++ b/src/battle/anim/draw.c
diff --git a/src/anim/drum.c b/src/battle/anim/drum.c
index 60cb2acc1..60cb2acc1 100755
--- a/src/anim/drum.c
+++ b/src/battle/anim/drum.c
diff --git a/src/anim/egg.c b/src/battle/anim/egg.c
index a5bcffa6d..a5bcffa6d 100755
--- a/src/anim/egg.c
+++ b/src/battle/anim/egg.c
diff --git a/src/anim/espeed.c b/src/battle/anim/espeed.c
index 621d386e1..621d386e1 100755
--- a/src/anim/espeed.c
+++ b/src/battle/anim/espeed.c
diff --git a/src/anim/evasion.c b/src/battle/anim/evasion.c
index b4e81009b..b4e81009b 100755
--- a/src/anim/evasion.c
+++ b/src/battle/anim/evasion.c
diff --git a/src/anim/fang.c b/src/battle/anim/fang.c
index 4df450691..4df450691 100755
--- a/src/anim/fang.c
+++ b/src/battle/anim/fang.c
diff --git a/src/anim/flash.c b/src/battle/anim/flash.c
index 0e087ec2d..0e087ec2d 100755
--- a/src/anim/flash.c
+++ b/src/battle/anim/flash.c
diff --git a/src/anim/flying_hearts.c b/src/battle/anim/flying_hearts.c
index 5b7d31a51..5b7d31a51 100755
--- a/src/anim/flying_hearts.c
+++ b/src/battle/anim/flying_hearts.c
diff --git a/src/anim/flying_path.c b/src/battle/anim/flying_path.c
index 017f89858..017f89858 100755
--- a/src/anim/flying_path.c
+++ b/src/battle/anim/flying_path.c
diff --git a/src/anim/flying_petals.c b/src/battle/anim/flying_petals.c
index ed6497b7a..ed6497b7a 100755
--- a/src/anim/flying_petals.c
+++ b/src/battle/anim/flying_petals.c
diff --git a/src/anim/glitter.c b/src/battle/anim/glitter.c
index 548397932..548397932 100755
--- a/src/anim/glitter.c
+++ b/src/battle/anim/glitter.c
diff --git a/src/anim/glow.c b/src/battle/anim/glow.c
index 6038825af..6038825af 100755
--- a/src/anim/glow.c
+++ b/src/battle/anim/glow.c
diff --git a/src/anim/grip.c b/src/battle/anim/grip.c
index 93c3dba96..93c3dba96 100755
--- a/src/anim/grip.c
+++ b/src/battle/anim/grip.c
diff --git a/src/anim/grow.c b/src/battle/anim/grow.c
index 35047c8b0..35047c8b0 100755
--- a/src/anim/grow.c
+++ b/src/battle/anim/grow.c
diff --git a/src/anim/guillotine.c b/src/battle/anim/guillotine.c
index b710f372a..b710f372a 100755
--- a/src/anim/guillotine.c
+++ b/src/battle/anim/guillotine.c
diff --git a/src/anim/heal.c b/src/battle/anim/heal.c
index c5950650c..c5950650c 100755
--- a/src/anim/heal.c
+++ b/src/battle/anim/heal.c
diff --git a/src/anim/heart_1.c b/src/battle/anim/heart_1.c
index 1ab83136c..1ab83136c 100755
--- a/src/anim/heart_1.c
+++ b/src/battle/anim/heart_1.c
diff --git a/src/anim/homing.c b/src/battle/anim/homing.c
index c5e372d78..c5e372d78 100755
--- a/src/anim/homing.c
+++ b/src/battle/anim/homing.c
diff --git a/src/anim/hop.c b/src/battle/anim/hop.c
index 60f3b8a48..60f3b8a48 100755
--- a/src/anim/hop.c
+++ b/src/battle/anim/hop.c
diff --git a/src/anim/hop_2.c b/src/battle/anim/hop_2.c
index 5458c4599..5458c4599 100755
--- a/src/anim/hop_2.c
+++ b/src/battle/anim/hop_2.c
diff --git a/src/anim/kiss_fountain.c b/src/battle/anim/kiss_fountain.c
index 2e7f64c11..2e7f64c11 100755
--- a/src/anim/kiss_fountain.c
+++ b/src/battle/anim/kiss_fountain.c
diff --git a/src/anim/leaf.c b/src/battle/anim/leaf.c
index 13d1bc9f5..13d1bc9f5 100755
--- a/src/anim/leaf.c
+++ b/src/battle/anim/leaf.c
diff --git a/src/anim/love_bg.c b/src/battle/anim/love_bg.c
index c5659463e..c5659463e 100755
--- a/src/anim/love_bg.c
+++ b/src/battle/anim/love_bg.c
diff --git a/src/anim/lunge_1.c b/src/battle/anim/lunge_1.c
index f1e1e35b6..f1e1e35b6 100755
--- a/src/anim/lunge_1.c
+++ b/src/battle/anim/lunge_1.c
diff --git a/src/anim/lunge_2.c b/src/battle/anim/lunge_2.c
index 3972bee59..3972bee59 100755
--- a/src/anim/lunge_2.c
+++ b/src/battle/anim/lunge_2.c
diff --git a/src/anim/money.c b/src/battle/anim/money.c
index 91eaf20b1..91eaf20b1 100755
--- a/src/anim/money.c
+++ b/src/battle/anim/money.c
diff --git a/src/anim/moon.c b/src/battle/anim/moon.c
index e2a31d14d..e2a31d14d 100755
--- a/src/anim/moon.c
+++ b/src/battle/anim/moon.c
diff --git a/src/anim/note_rain.c b/src/battle/anim/note_rain.c
index fd62b7176..fd62b7176 100755
--- a/src/anim/note_rain.c
+++ b/src/battle/anim/note_rain.c
diff --git a/src/anim/note_scatter.c b/src/battle/anim/note_scatter.c
index 9ff49ee9d..9ff49ee9d 100755
--- a/src/anim/note_scatter.c
+++ b/src/battle/anim/note_scatter.c
diff --git a/src/anim/note_scatter_2.c b/src/battle/anim/note_scatter_2.c
index a163aa9a5..a163aa9a5 100755
--- a/src/anim/note_scatter_2.c
+++ b/src/battle/anim/note_scatter_2.c
diff --git a/src/anim/note_wave.c b/src/battle/anim/note_wave.c
index 4dc3ceb75..4dc3ceb75 100755
--- a/src/anim/note_wave.c
+++ b/src/battle/anim/note_wave.c
diff --git a/src/anim/orbit.c b/src/battle/anim/orbit.c
index 9b77552fa..9b77552fa 100755
--- a/src/anim/orbit.c
+++ b/src/battle/anim/orbit.c
diff --git a/src/anim/orbit_fast.c b/src/battle/anim/orbit_fast.c
index 30396f398..30396f398 100755
--- a/src/anim/orbit_fast.c
+++ b/src/battle/anim/orbit_fast.c
diff --git a/src/anim/orbit_scatter.c b/src/battle/anim/orbit_scatter.c
index 6cebc9375..6cebc9375 100755
--- a/src/anim/orbit_scatter.c
+++ b/src/battle/anim/orbit_scatter.c
diff --git a/src/anim/orbs.c b/src/battle/anim/orbs.c
index 22e7d3895..22e7d3895 100755
--- a/src/anim/orbs.c
+++ b/src/battle/anim/orbs.c
diff --git a/src/anim/osmose.c b/src/battle/anim/osmose.c
index f1f1b25ff..f1f1b25ff 100755
--- a/src/anim/osmose.c
+++ b/src/battle/anim/osmose.c
diff --git a/src/anim/perceive.c b/src/battle/anim/perceive.c
index 27afcbc0c..27afcbc0c 100755
--- a/src/anim/perceive.c
+++ b/src/battle/anim/perceive.c
diff --git a/src/anim/powder.c b/src/battle/anim/powder.c
index 178a61737..178a61737 100755
--- a/src/anim/powder.c
+++ b/src/battle/anim/powder.c
diff --git a/src/anim/ring.c b/src/battle/anim/ring.c
index 0a5816b23..0a5816b23 100755
--- a/src/anim/ring.c
+++ b/src/battle/anim/ring.c
diff --git a/src/anim/roots.c b/src/battle/anim/roots.c
index 40c51808a..40c51808a 100755
--- a/src/anim/roots.c
+++ b/src/battle/anim/roots.c
diff --git a/src/anim/scan.c b/src/battle/anim/scan.c
index 5573758c3..5573758c3 100755
--- a/src/anim/scan.c
+++ b/src/battle/anim/scan.c
diff --git a/src/anim/scary_face.c b/src/battle/anim/scary_face.c
index 9f1dfd7d0..9f1dfd7d0 100755
--- a/src/anim/scary_face.c
+++ b/src/battle/anim/scary_face.c
diff --git a/src/anim/seed.c b/src/battle/anim/seed.c
index bd072849a..bd072849a 100755
--- a/src/anim/seed.c
+++ b/src/battle/anim/seed.c
diff --git a/src/anim/shadow_enlarge.c b/src/battle/anim/shadow_enlarge.c
index bed6c7ea3..bed6c7ea3 100755
--- a/src/anim/shadow_enlarge.c
+++ b/src/battle/anim/shadow_enlarge.c
diff --git a/src/anim/shadow_minimize.c b/src/battle/anim/shadow_minimize.c
index 22ebeab7a..22ebeab7a 100755
--- a/src/anim/shadow_minimize.c
+++ b/src/battle/anim/shadow_minimize.c
diff --git a/src/anim/shield.c b/src/battle/anim/shield.c
index 8ed4f9796..8ed4f9796 100755
--- a/src/anim/shield.c
+++ b/src/battle/anim/shield.c
diff --git a/src/anim/shimmer.c b/src/battle/anim/shimmer.c
index ecb3dcdf9..ecb3dcdf9 100755
--- a/src/anim/shimmer.c
+++ b/src/battle/anim/shimmer.c
diff --git a/src/anim/silhouette.c b/src/battle/anim/silhouette.c
index 71ff3dae2..71ff3dae2 100755
--- a/src/anim/silhouette.c
+++ b/src/battle/anim/silhouette.c
diff --git a/src/anim/slash.c b/src/battle/anim/slash.c
index c5869c4ab..c5869c4ab 100755
--- a/src/anim/slash.c
+++ b/src/battle/anim/slash.c
diff --git a/src/anim/sleep.c b/src/battle/anim/sleep.c
index 58ecc702f..58ecc702f 100755
--- a/src/anim/sleep.c
+++ b/src/battle/anim/sleep.c
diff --git a/src/anim/slice.c b/src/battle/anim/slice.c
index 8e33dcb06..8e33dcb06 100755
--- a/src/anim/slice.c
+++ b/src/battle/anim/slice.c
diff --git a/src/anim/smoke.c b/src/battle/anim/smoke.c
index c6ce91b76..c6ce91b76 100755
--- a/src/anim/smoke.c
+++ b/src/battle/anim/smoke.c
diff --git a/src/anim/sonic.c b/src/battle/anim/sonic.c
index 684516ba7..684516ba7 100755
--- a/src/anim/sonic.c
+++ b/src/battle/anim/sonic.c
diff --git a/src/anim/sonic_task.c b/src/battle/anim/sonic_task.c
index efd13dff6..efd13dff6 100755
--- a/src/anim/sonic_task.c
+++ b/src/battle/anim/sonic_task.c
diff --git a/src/anim/spin_finger.c b/src/battle/anim/spin_finger.c
index adf41b261..adf41b261 100755
--- a/src/anim/spin_finger.c
+++ b/src/battle/anim/spin_finger.c
diff --git a/src/anim/spit.c b/src/battle/anim/spit.c
index f9ad462ae..f9ad462ae 100755
--- a/src/anim/spit.c
+++ b/src/battle/anim/spit.c
diff --git a/src/anim/splash.c b/src/battle/anim/splash.c
index 1b0ceba93..1b0ceba93 100755
--- a/src/anim/splash.c
+++ b/src/battle/anim/splash.c
diff --git a/src/anim/startle.c b/src/battle/anim/startle.c
index acbf80fec..acbf80fec 100755
--- a/src/anim/startle.c
+++ b/src/battle/anim/startle.c
diff --git a/src/anim/strike.c b/src/battle/anim/strike.c
index f2fbdb5a4..f2fbdb5a4 100755
--- a/src/anim/strike.c
+++ b/src/battle/anim/strike.c
diff --git a/src/anim/switch.c b/src/battle/anim/switch.c
index a1be144df..a1be144df 100755
--- a/src/anim/switch.c
+++ b/src/battle/anim/switch.c
diff --git a/src/anim/sword.c b/src/battle/anim/sword.c
index 536f89b26..536f89b26 100755
--- a/src/anim/sword.c
+++ b/src/battle/anim/sword.c
diff --git a/src/anim/taunt_finger.c b/src/battle/anim/taunt_finger.c
index 7024f85a0..7024f85a0 100755
--- a/src/anim/taunt_finger.c
+++ b/src/battle/anim/taunt_finger.c
diff --git a/src/anim/tendrils.c b/src/battle/anim/tendrils.c
index ba1014d2f..ba1014d2f 100755
--- a/src/anim/tendrils.c
+++ b/src/battle/anim/tendrils.c
diff --git a/src/anim/thought.c b/src/battle/anim/thought.c
index 9cffafe14..9cffafe14 100755
--- a/src/anim/thought.c
+++ b/src/battle/anim/thought.c
diff --git a/src/anim/thrashing.c b/src/battle/anim/thrashing.c
index 9811c546a..9811c546a 100755
--- a/src/anim/thrashing.c
+++ b/src/battle/anim/thrashing.c
diff --git a/src/anim/tile_in.c b/src/battle/anim/tile_in.c
index 5fcbadbb7..5fcbadbb7 100755
--- a/src/anim/tile_in.c
+++ b/src/battle/anim/tile_in.c
diff --git a/src/anim/tile_out.c b/src/battle/anim/tile_out.c
index 8b710268f..8b710268f 100755
--- a/src/anim/tile_out.c
+++ b/src/battle/anim/tile_out.c
diff --git a/src/anim/twinkle.c b/src/battle/anim/twinkle.c
index 56095c29d..56095c29d 100755
--- a/src/anim/twinkle.c
+++ b/src/battle/anim/twinkle.c
diff --git a/src/anim/unused_1.c b/src/battle/anim/unused_1.c
index fdcef0de9..fdcef0de9 100755
--- a/src/anim/unused_1.c
+++ b/src/battle/anim/unused_1.c
diff --git a/src/anim/unused_2.c b/src/battle/anim/unused_2.c
index f7f5be88d..f7f5be88d 100755
--- a/src/anim/unused_2.c
+++ b/src/battle/anim/unused_2.c
diff --git a/src/anim/unused_3.c b/src/battle/anim/unused_3.c
index 049e0ca1b..049e0ca1b 100755
--- a/src/anim/unused_3.c
+++ b/src/battle/anim/unused_3.c
diff --git a/src/anim/unused_4.c b/src/battle/anim/unused_4.c
index 72ecde05c..72ecde05c 100755
--- a/src/anim/unused_4.c
+++ b/src/battle/anim/unused_4.c
diff --git a/src/anim/unused_5.c b/src/battle/anim/unused_5.c
index 4dc2da70d..4dc2da70d 100755
--- a/src/anim/unused_5.c
+++ b/src/battle/anim/unused_5.c
diff --git a/src/anim/unused_6.c b/src/battle/anim/unused_6.c
index f7c87647f..f7c87647f 100755
--- a/src/anim/unused_6.c
+++ b/src/battle/anim/unused_6.c
diff --git a/src/anim/unused_7.c b/src/battle/anim/unused_7.c
index 3a8998f1d..3a8998f1d 100755
--- a/src/anim/unused_7.c
+++ b/src/battle/anim/unused_7.c
diff --git a/src/anim/unused_8.c b/src/battle/anim/unused_8.c
index bcebfcd2b..bcebfcd2b 100755
--- a/src/anim/unused_8.c
+++ b/src/battle/anim/unused_8.c
diff --git a/src/anim/unused_9.c b/src/battle/anim/unused_9.c
index 579238fbc..579238fbc 100755
--- a/src/anim/unused_9.c
+++ b/src/battle/anim/unused_9.c
diff --git a/src/anim/wave_finger.c b/src/battle/anim/wave_finger.c
index 58f0f8778..58f0f8778 100755
--- a/src/anim/wave_finger.c
+++ b/src/battle/anim/wave_finger.c
diff --git a/src/anim/whip.c b/src/battle/anim/whip.c
index 3aa0758a9..3aa0758a9 100755
--- a/src/anim/whip.c
+++ b/src/battle/anim/whip.c
diff --git a/src/anim/withdraw.c b/src/battle/anim/withdraw.c
index 9abcff32d..9abcff32d 100755
--- a/src/anim/withdraw.c
+++ b/src/battle/anim/withdraw.c