From 9217a263998387495d5ae9a9d8faf835d81cb1c8 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 21 Jun 2019 16:29:47 -0400 Subject: battle_anim_mon_movement: through sub_8099004 --- include/battle_anim.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'include/battle_anim.h') diff --git a/include/battle_anim.h b/include/battle_anim.h index 4ea3bdead..f37b387ae 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -63,6 +63,8 @@ extern u8 gAnimBankAttacker; extern u8 gAnimBankTarget; extern u16 gAnimSpeciesByBanks[BATTLE_BANKS_COUNT]; extern u8 gUnknown_02038440; +extern u8 gBattlerSpriteIds[MAX_BATTLERS_COUNT]; +extern u8 gBattleAnimAttacker; void ClearBattleAnimationVars(void); void DoMoveAnim(u16 move); @@ -77,6 +79,7 @@ s8 BattleAnimAdjustPanning(s8 pan); s8 BattleAnimAdjustPanning2(s8 pan); s16 sub_80A52EC(s16 a); s16 CalculatePanIncrement(s16 sourcePan, s16 targetPan, s16 incrementPan); +bool8 sub_8072DF0(u8 battlerId); // battle_anim_80FE840.s void SetAnimBgAttribute(u8 bgId, u8 attributeId, u8 value); -- cgit v1.2.3 From 95b5a2753e8d881996e5f5561cf657e8f92629fc Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 21 Jun 2019 16:53:47 -0400 Subject: battle_anim_mon_movement: through sub_80991B4 --- include/battle_anim.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'include/battle_anim.h') diff --git a/include/battle_anim.h b/include/battle_anim.h index f37b387ae..15e40c9f0 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -59,12 +59,11 @@ extern u8 gAnimFriendship; extern u16 gWeatherMoveAnim; extern s16 gBattleAnimArgs[ANIM_ARGS_COUNT]; extern u8 gAnimMoveTurn; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; extern u16 gAnimSpeciesByBanks[BATTLE_BANKS_COUNT]; extern u8 gUnknown_02038440; extern u8 gBattlerSpriteIds[MAX_BATTLERS_COUNT]; -extern u8 gBattleAnimAttacker; void ClearBattleAnimationVars(void); void DoMoveAnim(u16 move); @@ -124,4 +123,8 @@ u8 ItemIdToBallId(u16 itemId); u8 LaunchBallStarsTask(u8 x, u8 y, u8 kindOfStars, u8 arg3, u8 ballId); u8 LaunchBallFadeMonTask(bool8 unFadeLater, u8 bank, u32 arg2, u8 ballId); +// battle_anim_mons.s +void sub_8074DC4(struct Sprite * sprite); +void sub_80754B8(struct Sprite * sprite); + #endif // GUARD_BATTLE_ANIM_H -- cgit v1.2.3 From 374ea9ec6261281ce86327cbcd543ca7d8283bdf Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 21 Jun 2019 21:19:45 -0400 Subject: battle_anim_mon_movement: through sub_809946C --- include/battle_anim.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include/battle_anim.h') diff --git a/include/battle_anim.h b/include/battle_anim.h index 15e40c9f0..60e66e085 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -125,6 +125,7 @@ u8 LaunchBallFadeMonTask(bool8 unFadeLater, u8 bank, u32 arg2, u8 ballId); // battle_anim_mons.s void sub_8074DC4(struct Sprite * sprite); +void sub_8074E14(struct Sprite * sprite); void sub_80754B8(struct Sprite * sprite); #endif // GUARD_BATTLE_ANIM_H -- cgit v1.2.3 From 43d256370461121e3314765a7b98d9a00a9ffc95 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 22 Jun 2019 14:05:30 -0400 Subject: Finish battle_anim_mon_movement --- include/battle_anim.h | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'include/battle_anim.h') diff --git a/include/battle_anim.h b/include/battle_anim.h index 60e66e085..5929a318e 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -64,6 +64,8 @@ extern u8 gBattleAnimTarget; extern u16 gAnimSpeciesByBanks[BATTLE_BANKS_COUNT]; extern u8 gUnknown_02038440; extern u8 gBattlerSpriteIds[MAX_BATTLERS_COUNT]; +extern u16 gUnknown_2037EEC; +extern s32 gUnknown_2037EE8; void ClearBattleAnimationVars(void); void DoMoveAnim(u16 move); @@ -127,5 +129,10 @@ u8 LaunchBallFadeMonTask(bool8 unFadeLater, u8 bank, u32 arg2, u8 ballId); void sub_8074DC4(struct Sprite * sprite); void sub_8074E14(struct Sprite * sprite); void sub_80754B8(struct Sprite * sprite); +void sub_80758E0(u8 spriteId, u8 b); +void sub_8075980(u8 spriteId); +void obj_id_set_rotscale(u8 spriteId, s16 xScale, s16 yScale, u16 rotation); +bool8 sub_8073788(void); +void sub_80759DC(u8 spriteId); #endif // GUARD_BATTLE_ANIM_H -- cgit v1.2.3