Merge branch 'master' into mystery_gift

19 files changed, 27 insertions, 19 deletions

diff --git a/common_syms/battle_anim_8170478.txt b/common_syms/battle_anim_special.txt
index 2fc194df7..2fc194df7 100755
--- a/common_syms/battle_anim_8170478.txt
+++ b/common_syms/battle_anim_special.txt
diff --git a/include/battle.h b/include/battle.h
index 38bce0e61..13c1851cf 100644
--- a/include/battle.h
+++ b/include/battle.h
@@ -564,9 +564,7 @@ struct BattleScripting
 };
 
 // rom_80A5C6C
-u8 GetBattlerSide(u8 battler);
-u8 GetBattlerPosition(u8 battler);
-u8 GetBattlerAtPosition(u8 position);
+
 
 struct BattleSpriteInfo
 {
diff --git a/include/battle_anim.h b/include/battle_anim.h
index b3350f893..949bc236b 100644
--- a/include/battle_anim.h
+++ b/include/battle_anim.h
@@ -73,7 +73,7 @@ void sub_8118FBC(int bgId, u8 arg1, u8 arg2, u8 battlerPosition, u8 arg4, u8 *ar
 void HandleIntroSlide(u8 terrainId);
 int GetAnimBgAttribute(u8 bgId, u8 attributeId);
 
-// battle_anim_80A5C6C.s
+// battle_anim_mons.s
 void TranslateSpriteInEllipseOverDuration(struct Sprite *sprite);
 void sub_80A8AEC(struct Sprite *sprite);
 void sub_80A8A6C(struct Sprite *sprite);
@@ -155,6 +155,9 @@ void sub_80A6DEC(struct Sprite *sprite);
 void DestroyAnimVisualTaskAndDisableBlend(u8 taskId);
 void DestroySpriteAndFreeResources_(struct Sprite *sprite);
 void SetBattlerSpriteYOffsetFromOtherYScale(u8 spriteId, u8 otherSpriteId);
+u8 GetBattlerSide(u8 battler);
+u8 GetBattlerPosition(u8 battler);
+u8 GetBattlerAtPosition(u8 position);
 
 enum
 {
@@ -193,7 +196,7 @@ u8 GetSubstituteSpriteDefault_Y(u8 battlerId);
 void sub_80A64EC(struct Sprite *sprite);
 void sub_80A718C(struct Sprite *sprite);
 
-// battle_anim_80A9C70.s
+// battle_anim_status_effects.s
 #define STAT_ANIM_PLUS1  15
 #define STAT_ANIM_PLUS2  39
 #define STAT_ANIM_MINUS1 22
@@ -204,13 +207,11 @@ void sub_80A718C(struct Sprite *sprite);
 #define STAT_ANIM_MULTIPLE_MINUS2 58
 void LaunchStatusAnimation(u8 battlerId, u8 statusAnimId);
 
-// battle_anim_8170478.c
-void sub_8172EF0(u8 battler, struct Pokemon *mon);
-
 // ground.c
 void sub_81152DC(u8 taskId);
 
-// battle_anim_8170478.s
+// battle_anim_special.c
+void sub_8172EF0(u8 battler, struct Pokemon *mon);
 u8 ItemIdToBallId(u16 itemId);
 u8 AnimateBallOpenParticles(u8 x, u8 y, u8 priority, u8 subpriority, u8 ballId);
 u8 LaunchBallFadeMonTask(bool8 unFadeLater, u8 battlerId, u32 selectedPalettes, u8 ballId);
diff --git a/ld_script.txt b/ld_script.txt
index 9bfa273f3..fd9d02848 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -121,10 +121,10 @@ SECTIONS {
         src/palette.o(.text);
         src/sound.o(.text);
         src/battle_anim.o(.text);
-        src/battle_anim_80A5C6C.o(.text);
+        src/battle_anim_mons.o(.text);
         src/task.o(.text);
         src/reshow_battle_screen.o(.text);
-        src/battle_anim_80A9C70.o(.text);
+        src/battle_anim_status_effects.o(.text);
         src/title_screen.o(.text);
         src/field_weather.o(.text);
         src/field_weather_effect.o(.text);
@@ -146,7 +146,7 @@ SECTIONS {
         src/mail_data.o(.text);
         src/map_name_popup.o(.text);
         src/item_menu_icons.o(.text);
-        src/battle_anim_80D51AC.o(.text);
+        src/battle_anim_mon_movement.o(.text);
         src/item.o(.text);
         src/contest.o(.text);
         src/shop.o(.text);
@@ -248,7 +248,7 @@ SECTIONS {
         src/intro.o(.text);
         src/reset_save_heap.o(.text);
         src/field_region_map.o(.text);
-        src/battle_anim_8170478.o(.text);
+        src/battle_anim_special.o(.text);
         src/hall_of_fame.o(.text);
         src/credits.o(.text);
         src/lottery_corner.o(.text);
@@ -463,9 +463,9 @@ SECTIONS {
         src/palette.o(.rodata);
         src/sound.o(.rodata);
         src/battle_anim.o(.rodata);
-        src/battle_anim_80A5C6C.o(.rodata);
+        src/battle_anim_mons.o(.rodata);
         data/map_events.o(.rodata);
-        src/battle_anim_80A9C70.o(.rodata);
+        src/battle_anim_status_effects.o(.rodata);
         src/title_screen.o(.rodata);
         src/field_weather.o(.rodata);
         src/field_weather_effect.o(.rodata);
@@ -484,7 +484,7 @@ SECTIONS {
         src/fldeff_cut.o(.rodata);
         src/map_name_popup.o(.rodata);
         src/item_menu_icons.o(.rodata);
-        src/battle_anim_80D51AC.o(.rodata);
+        src/battle_anim_mon_movement.o(.rodata);
         src/item.o(.rodata);
         data/contest.o(.rodata);
         src/shop.o(.rodata);
@@ -568,7 +568,7 @@ SECTIONS {
         src/player_pc.o(.rodata);
         src/intro.o(.rodata);
         src/field_region_map.o(.rodata);
-        src/battle_anim_8170478.o(.rodata);
+        src/battle_anim_special.o(.rodata);
         src/hall_of_fame.o(.rodata);
         src/credits.o(.rodata);
         src/lottery_corner.o(.rodata);
diff --git a/src/battle_ai_script_commands.c b/src/battle_ai_script_commands.c
index 6098e2d3a..61876e0de 100644
--- a/src/battle_ai_script_commands.c
+++ b/src/battle_ai_script_commands.c
@@ -1,5 +1,6 @@
 #include "global.h"
 #include "battle.h"
+#include "battle_anim.h"
 #include "battle_ai_script_commands.h"
 #include "battle_factory.h"
 #include "battle_setup.h"
diff --git a/src/battle_ai_switch_items.c b/src/battle_ai_switch_items.c
index a5958ebc6..2d67fda99 100644
--- a/src/battle_ai_switch_items.c
+++ b/src/battle_ai_switch_items.c
@@ -1,5 +1,6 @@
 #include "global.h"
 #include "battle.h"
+#include "battle_anim.h"
 #include "battle_controllers.h"
 #include "pokemon.h"
 #include "random.h"
diff --git a/src/battle_anim_80D51AC.c b/src/battle_anim_mon_movement.c
index 250a0459f..250a0459f 100644
--- a/src/battle_anim_80D51AC.c
+++ b/src/battle_anim_mon_movement.c
diff --git a/src/battle_anim_80A5C6C.c b/src/battle_anim_mons.c
index 372377a0c..372377a0c 100644
--- a/src/battle_anim_80A5C6C.c
+++ b/src/battle_anim_mons.c
diff --git a/src/battle_anim_8170478.c b/src/battle_anim_special.c
index 92874fe09..92874fe09 100755
--- a/src/battle_anim_8170478.c
+++ b/src/battle_anim_special.c
diff --git a/src/battle_anim_80A9C70.c b/src/battle_anim_status_effects.c
index 1271680e0..1271680e0 100644
--- a/src/battle_anim_80A9C70.c
+++ b/src/battle_anim_status_effects.c
diff --git a/src/battle_main.c b/src/battle_main.c
index 0f593fef6..19fd01e3c 100644
--- a/src/battle_main.c
+++ b/src/battle_main.c
@@ -1,5 +1,6 @@
 #include "global.h"
 #include "battle.h"
+#include "battle_anim.h"
 #include "battle_ai_script_commands.h"
 #include "battle_arena.h"
 #include "battle_controllers.h"
diff --git a/src/battle_message.c b/src/battle_message.c
index 6762cd416..f93765b89 100644
--- a/src/battle_message.c
+++ b/src/battle_message.c
@@ -1,5 +1,6 @@
 #include "global.h"
 #include "battle.h"
+#include "battle_anim.h"
 #include "battle_controllers.h"
 #include "battle_message.h"
 #include "battle_setup.h"
diff --git a/src/battle_tv.c b/src/battle_tv.c
index d3ca9b61f..26df08786 100644
--- a/src/battle_tv.c
+++ b/src/battle_tv.c
@@ -1,6 +1,7 @@
 #include "global.h"
 #include "pokemon.h"
 #include "battle.h"
+#include "battle_anim.h"
 #include "battle_tv.h"
 #include "constants/battle_string_ids.h"
 #include "constants/battle_anim.h"
diff --git a/src/battle_util.c b/src/battle_util.c
index aa88cf952..a7962b7f7 100644
--- a/src/battle_util.c
+++ b/src/battle_util.c
@@ -1,5 +1,6 @@
 #include "global.h"
 #include "battle.h"
+#include "battle_anim.h"
 #include "constants/battle_script_commands.h"
 #include "constants/abilities.h"
 #include "constants/moves.h"
diff --git a/src/battle_util2.c b/src/battle_util2.c
index 9c0d55a57..5ef969fd5 100644
--- a/src/battle_util2.c
+++ b/src/battle_util2.c
@@ -1,5 +1,6 @@
 #include "global.h"
 #include "battle.h"
+#include "battle_anim.h"
 #include "battle_controllers.h"
 #include "alloc.h"
 #include "pokemon.h"
diff --git a/src/pokemon.c b/src/pokemon.c
index 1ee9c4cff..7c26b4c22 100644
--- a/src/pokemon.c
+++ b/src/pokemon.c
@@ -2,6 +2,7 @@
 #include "alloc.h"
 #include "apprentice.h"
 #include "battle.h"
+#include "battle_anim.h"
 #include "battle_controllers.h"
 #include "battle_message.h"
 #include "battle_pike.h"
diff --git a/src/recorded_battle.c b/src/recorded_battle.c
index c11dc55e7..acd4c2ce6 100644
--- a/src/recorded_battle.c
+++ b/src/recorded_battle.c
@@ -1,5 +1,6 @@
 #include "global.h"
 #include "battle.h"
+#include "battle_anim.h"
 #include "recorded_battle.h"
 #include "main.h"
 #include "pokemon.h"
diff --git a/sym_common.txt b/sym_common.txt
index 414d223e9..17dbf5c41 100644
--- a/sym_common.txt
+++ b/sym_common.txt
@@ -34,7 +34,7 @@
 	.include "save.o"
 	.include "battle_tower.o"
 	.include "intro.o"
-	.include "battle_anim_8170478.o"
+	.include "battle_anim_special.o"
 	.include "battle_factory_screen.o"
 	.include "apprentice.o"
 	
diff --git a/sym_ewram.txt b/sym_ewram.txt
index f2efe6a69..0715de97a 100644
--- a/sym_ewram.txt
+++ b/sym_ewram.txt
@@ -103,7 +103,7 @@ gUnknown_02022D00: @ 2022D00
 	.include "src/palette.o"
 	.include "src/sound.o"
 	.include "src/battle_anim.o"
-	.include "src/battle_anim_80A5C6C.o"
+	.include "src/battle_anim_mons.o"
 
 	.space 0xC
 	.include "src/field_weather.o"