summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xcommon_syms/battle_anim_throw.txt (renamed from common_syms/battle_anim_pokeball.txt)0
-rw-r--r--include/battle_anim.h2
-rw-r--r--ld_script.txt4
-rwxr-xr-xsrc/battle_anim_throw.c (renamed from src/battle_anim_pokeball.c)0
-rw-r--r--sym_common.txt2
5 files changed, 4 insertions, 4 deletions
diff --git a/common_syms/battle_anim_pokeball.txt b/common_syms/battle_anim_throw.txt
index 5e2e8b3ff..5e2e8b3ff 100755
--- a/common_syms/battle_anim_pokeball.txt
+++ b/common_syms/battle_anim_throw.txt
diff --git a/include/battle_anim.h b/include/battle_anim.h
index d4052c45e..096d533e2 100644
--- a/include/battle_anim.h
+++ b/include/battle_anim.h
@@ -207,7 +207,7 @@ void LaunchStatusAnimation(u8 battlerId, u8 statusAnimId);
// battle_anim_ground.c
void AnimTask_HorizontalShake(u8 taskId);
-// battle_anim_pokeball.c
+// battle_anim_throw.c
void TryShinyAnimation(u8 battler, struct Pokemon *mon);
u8 ItemIdToBallId(u16 itemId);
u8 AnimateBallOpenParticles(u8 x, u8 y, u8 priority, u8 subpriority, u8 ballId);
diff --git a/ld_script.txt b/ld_script.txt
index da0ecac9e..0b8702d96 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -258,7 +258,7 @@ SECTIONS {
src/intro.o(.text);
src/reset_save_heap.o(.text);
src/field_region_map.o(.text);
- src/battle_anim_pokeball.o(.text);
+ src/battle_anim_throw.o(.text);
src/hall_of_fame.o(.text);
src/credits.o(.text);
src/lottery_corner.o(.text);
@@ -616,7 +616,7 @@ SECTIONS {
src/player_pc.o(.rodata);
src/intro.o(.rodata);
src/field_region_map.o(.rodata);
- src/battle_anim_pokeball.o(.rodata);
+ src/battle_anim_throw.o(.rodata);
src/hall_of_fame.o(.rodata);
src/credits.o(.rodata);
src/lottery_corner.o(.rodata);
diff --git a/src/battle_anim_pokeball.c b/src/battle_anim_throw.c
index 7049931d3..7049931d3 100755
--- a/src/battle_anim_pokeball.c
+++ b/src/battle_anim_throw.c
diff --git a/sym_common.txt b/sym_common.txt
index f63eaf680..02fde8971 100644
--- a/sym_common.txt
+++ b/sym_common.txt
@@ -63,7 +63,7 @@ gReservedSpritePaletteCount:
.include "save.o"
.include "battle_tower.o"
.include "intro.o"
- .include "battle_anim_pokeball.o"
+ .include "battle_anim_throw.o"
.include "battle_factory_screen.o"
.include "apprentice.o"