Sync battle anim - mons

include/battle_anim.h

@@ -365,11 +365,11 @@ void TranslateSpriteInCircle(struct Sprite *sprite);
 void TranslateSpriteInGrowingCircle(struct Sprite *sprite);
 void TranslateSpriteInEllipse(struct Sprite *sprite);
 void WaitAnimForDuration(struct Sprite *sprite);
-void SetupLinearTranslationWithFixedDuration(struct Sprite *sprite);
+void ConvertPosDataToTranslateLinearData(struct Sprite *sprite);
 void TranslateSpriteLinear(struct Sprite *sprite);
 void TranslateSpriteLinearFixedPoint(struct Sprite *sprite);
-void TranslateMonSpriteLinear(struct Sprite *sprite);
-void TranslateMonSpriteLinearFixedPoint(struct Sprite *sprite);
+void TranslateSpriteLinearById(struct Sprite *sprite);
+void TranslateSpriteLinearByIdFixedPoint(struct Sprite *sprite);
 void TranslateSpriteLinearAndFlicker(struct Sprite *sprite);
 void DestroySpriteAndMatrix(struct Sprite *sprite);
 void RunStoredCallbackWhenAffineAnimEnds(struct Sprite *sprite);
@@ -398,7 +398,7 @@ void InitAnimBgTilemapBuffer(u32 bgId, const void *src);
 void AnimLoadCompressedBgTilemap(u32 bgId, const u32 *src);
 u8 GetBattleBgPaletteNum(void);
 void ToggleBg3Mode(bool8 arg0);
-void StartSpriteLinearTranslationFromCurrentPos(struct Sprite *sprite);
+void TradeMenuBouncePartySprites(struct Sprite *sprite);
 void InitSpriteDataForLinearTranslation(struct Sprite *sprite);
 void InitAnimLinearTranslation(struct Sprite *sprite);
 void StartAnimLinearTranslation(struct Sprite *sprite);
@@ -406,11 +406,11 @@ void PlayerThrowBall_StartAnimLinearTranslation(struct Sprite *sprite);
 bool8 AnimTranslateLinear(struct Sprite *sprite);
 void AnimTranslateLinear_WithFollowup(struct Sprite *sprite);
 void InitAnimLinearTranslationWithSpeed(struct Sprite *sprite);
-void BattleAnim_InitAndRunLinearTranslationWithDuration(struct Sprite *sprite);
+void InitAnimLinearTranslationWithSpeedAndPos(struct Sprite *sprite);
 void InitAndRunAnimFastLinearTranslation(struct Sprite *sprite);
 bool8 AnimFastTranslateLinear(struct Sprite *sprite);
 void InitAnimFastLinearTranslationWithSpeed(struct Sprite *sprite);
-void InitAndStartAnimFastLinearTranslationWithSpeed(struct Sprite *sprite);
+void InitAnimFastLinearTranslationWithSpeedAndPos(struct Sprite *sprite);
 void SetSpriteRotScale(u8 spriteId, s16 xScale, s16 yScale, u16 rotation);
 void PrepareBattlerSpriteForRotScale(u8 spriteId, u8 objMode);
 void ResetSpriteRotScale(u8 spriteId);
@@ -420,7 +420,7 @@ void TryResetSpriteAffineState(struct Sprite *sprite);
 u16 ArcTan2Neg(s16 a, s16 b);
 void SetGreyscaleOrOriginalPalette(u16 paletteNum, bool8 restoreOriginalColor);
 u32 GetBattlePalettesMask(bool8 battleBackground, bool8 attacker, bool8 target, bool8 attackerPartner, bool8 targetPartner, bool8 a6, bool8 a7);
-u32 SelectBattlerSpritePalettes(bool8 playerLeft, bool8 playerRight, bool8 foeLeft, bool8 foeRight);
+u32 GetBattleMonSpritePalettesMask(bool8 playerLeft, bool8 playerRight, bool8 foeLeft, bool8 foeRight);
 u8 GetSpritePalIdxByBattler(u8 a1);
 void AnimSpriteOnMonPos(struct Sprite *sprite);
 void TranslateAnimSpriteToTargetMonLocation(struct Sprite *sprite);
@@ -440,7 +440,7 @@ void *LoadPointerFromVars(s16 lo, s16 hi);
 void BattleAnimHelper_SetSpriteSquashParams(struct Task *task, u8 spriteId, s16 xScale0, s16 yScale0, s16 xScale1, s16 yScale1, u16 duration);
 u8 BattleAnimHelper_RunSpriteSquash(struct Task *task);
 void AnimTask_GetFrustrationPowerLevel(u8 taskId);
-void ResetSpritePriorityOfAllVisibleBattlers(void);
+void InitPrioritiesForVisibleBattlers(void);
 u8 GetBattlerSpriteSubpriority(u8 battlerId);
 u8 GetBattlerSpriteBGPriority(u8 battlerId);
 
@@ -451,12 +451,12 @@ u8 CreateAdditionalMonSpriteForMoveAnim(u16 species, bool8 isBackpic, u8 templat
 void DestroySpriteAndFreeResources_(struct Sprite *sprite);
 s16 GetBattlerSpriteCoordAttr(u8 battlerId, u8 attr);
 void SetAverageBattlerPositions(u8 battlerId, bool8 respectMonPicOffsets, s16 *x, s16 *y);
-u8 CreateCloneOfSpriteInWindowMode(s32 battlerId, u8 spriteId, s32 species);
-void SpriteCB_AnimTranslateSpriteLinearAndFlicker(struct Sprite *sprite);
-void SpriteCB_AnimTranslateSpriteLinearAndFlicker2(struct Sprite *sprite);
-void SpriteCB_TrackOffsetFromAttackerAndWaitAnim(struct Sprite *sprite);
+u8 CreateInvisibleSpriteCopy(s32 battlerId, u8 spriteId, s32 species);
+void AnimTranslateLinearAndFlicker_Flipped(struct Sprite *sprite);
+void AnimTranslateLinearAndFlicker(struct Sprite *sprite);
+void AnimSpinningSparkle(struct Sprite *sprite);
 void AnimTask_AttackerPunchWithTrace(u8 taskId);
-void SpriteCB_WeatherBallUp(struct Sprite *sprite);
+void AnimWeatherBallUp(struct Sprite *sprite);
 void AnimWeatherBallDown(struct Sprite *sprite);
 
 // battle_anim_mon_movement.c

include/data.h

@@ -14,6 +14,10 @@ struct MonCoords
     u8 y_offset;
 };
 
+#define MON_COORDS_SIZE(width, height)(DIV_ROUND_UP(width, 8) << 4 | DIV_ROUND_UP(height, 8))
+#define GET_MON_COORDS_WIDTH(size)((size >> 4) * 8)
+#define GET_MON_COORDS_HEIGHT(size)((size & 0xF) * 8)
+
 extern const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1];
 extern const u8 gMoveNames[][13];
 extern const u16 gUnknown_8251CB8[];

include/palette.h

@@ -78,7 +78,7 @@ void sub_80716F8(const u16 *src, u16 *dst, u16 count, u8 a4);
 void sub_80717A8(u32 a1, s8 a2, u8 a3, u8 a4, u16 a5, u8 a6, u8 a7);
 bool32 sub_807185C(u8 var);
 void sub_8071898(void);
-void ResetPaletteStructByUid(u16 a1);
+void PaletteStruct_ResetById(u16 a1);
 void ResetPaletteStruct(u8 paletteNum);
 
 #endif // GUARD_PALETTE_H