Port battle_anim changes from pokeemerald

6 files changed, 23 insertions, 24 deletions

diff --git a/include/battle.h b/include/battle.h
index dda71e562..febb5807a 100644
--- a/include/battle.h
+++ b/include/battle.h
@@ -838,7 +838,7 @@ extern u8 gBattleTextBuff1[];
 // asm/battle_1.o
 void sub_800D6D4();
 void sub_800D74C();
-void sub_800D7B8(void);
+void DrawMainBattleBackground(void);
 void sub_800DAB8();
 void sub_800DE30(u8);
 void sub_800E23C();
diff --git a/include/battle_anim.h b/include/battle_anim.h
index 9decb8f95..2db27599f 100644
--- a/include/battle_anim.h
+++ b/include/battle_anim.h
@@ -9,6 +9,14 @@
 #define REG_BG2CNT_BITFIELD REG_BGnCNT_BITFIELD(2)
 #define REG_BG3CNT_BITFIELD REG_BGnCNT_BITFIELD(3)
 
+enum
+{
+    ANIM_BANK_ATTACKER,
+    ANIM_BANK_TARGET,
+    ANIM_BANK_ATK_PARTNER,
+    ANIM_BANK_DEF_PARTNER,
+};
+
 struct BattleAnimBackground
 {
     void *image;
@@ -36,20 +44,20 @@ struct UnknownStruct3
 
 extern void (*gAnimScriptCallback)(void);
 extern u8 gAnimScriptActive;
-extern u8 gHappinessMoveAnim;
-extern u8 gUnknown_0202F7C4;
+extern u8 gAnimFriendship;
+extern u8 gAnimMoveTurn;
 
-void ExecuteMoveAnim(u16 move);
-void DoMoveAnim(const u8 *const moveAnims[], u16 b, u8 c);
+void DoMoveAnim(u16 move);
+void LaunchBattleAnimation(const u8 *const moveAnims[], u16 b, u8 c);
 bool8 IsAnimBankSpriteVisible(u8 a);
 void sub_8076034(u8, u8);
-bool8 NotInBattle(void);
-void battle_anim_clear_some_data(void);
-void move_anim_8072740(struct Sprite *sprite);
+bool8 IsContest(void);
+void ClearBattleAnimationVars(void);
+void DestroyAnimSprite(struct Sprite *sprite);
 void DestroyAnimVisualTask(u8 task);
 void DestroyAnimVisualTask(u8 task);
 bool8 IsAnimBankSpriteVisible(u8);
-s8 sub_8076F98(s8 a);
+s8 BattleAnimAdjustPanning(s8 a);
 void sub_80763FC(u16 a, u16 *b, u32 c, u8 d);
 
 #endif
diff --git a/include/battle_interface.h b/include/battle_interface.h
index db41ee735..a3e00fd12 100644
--- a/include/battle_interface.h
+++ b/include/battle_interface.h
@@ -22,7 +22,7 @@ void sub_8043D84(u8, u8, u32, u32, u32);
 void sub_8043DB0(u8);
 void sub_8043DFC(u8);
 void nullsub_11();
-void sub_8043EB4(u8);
+void UpdateOamPriorityInAllHealthboxes(u8);
 void sub_8043F44(u8);
 void sub_804454C(void);
 u8 sub_8044804(u8, const struct BattleInterfaceStruct2 *, u8, u8);
diff --git a/include/contest.h b/include/contest.h
index ae2767aef..10392c00e 100644
--- a/include/contest.h
+++ b/include/contest.h
@@ -73,14 +73,14 @@ extern const struct ContestEffect gContestEffects[];
 extern const u8 *const gContestEffectStrings[];
 
 void ResetLinkContestBoolean(void);
-void sub_80AB2AC(void);
+void LoadContestBgAfterMoveAnim(void);
 void CB2_StartContest(void);
 void Contest_CreatePlayerMon(u8);
 void Contest_InitAllPokemon(u8, u8);
 u8 sub_80AE47C(struct Pokemon *party);
 u16 sub_80AE770(u8, u8);
 void sub_80AE82C(u8);
-u8 sub_80AEB1C(u16);
+u8 IsSpeciesNotUnown(u16);
 void sub_80AF668(void);
 void sub_80B0F28(u8);
 bool8 Contest_SaveWinner(u8);
diff --git a/include/rom_8077ABC.h b/include/rom_8077ABC.h
index 70bd6fe5a..04d996a21 100644
--- a/include/rom_8077ABC.h
+++ b/include/rom_8077ABC.h
@@ -4,21 +4,13 @@
 #include "sprite.h"
 #include "task.h"
 
-enum
-{
-    ANIM_BANK_ATK,
-    ANIM_BANK_DEF,
-    ANIM_BANK_ATK_PARTNER,
-    ANIM_BANK_DEF_PARTNER
-};
-
 struct Struct_sub_8078914 {
     u8 *field_0;
     u8 *field_4;
     u8 field_8;
 };
 
-u8 sub_8077ABC(u8, u8);
+u8 GetBankPosition(u8, u8);
 u8 sub_8077E44(u8 slot, u16 species, u8 a3);
 u8 GetAnimBankSpriteId(u8 side);
 void StoreSpriteCallbackInData(struct Sprite *sprite, void(*callback)(struct Sprite *));
@@ -36,8 +28,7 @@ u8 GetBankIdentity(u8 slot);
 u8 GetBankByPlayerAI(u8);
 u8 GetBankByPlayerAI(u8);
 u8 GetBankByPlayerAI(u8 state);
-u8 AnimBankSpriteExists(u8);
-bool8 AnimBankSpriteExists(u8);
+bool8 IsBankSpritePresent(u8);
 bool8 IsDoubleBattle();
 u8 IsDoubleBattle(void);
 bool8 IsDoubleBattle(void);
diff --git a/include/sprite.h b/include/sprite.h
index 9937a0797..13c76c84b 100644
--- a/include/sprite.h
+++ b/include/sprite.h
@@ -246,7 +246,7 @@ void BuildOamBuffer(void);
 u8 CreateSprite(const struct SpriteTemplate *template, s16 x, s16 y, u8 subpriority);
 u8 CreateSpriteAtEnd(const struct SpriteTemplate *template, s16 x, s16 y, u8 subpriority);
 u8 CreateInvisibleSprite(void (*callback)(struct Sprite *));
-u8 CreateSpriteAndAnimate(struct SpriteTemplate *template, s16 x, s16 y, u8 subpriority);
+u8 CreateSpriteAndAnimate(const struct SpriteTemplate *template, s16 x, s16 y, u8 subpriority);
 void DestroySprite(struct Sprite *sprite);
 void ResetOamRange(u8 a, u8 b);
 void LoadOam(void);