sync with pret/pokeemerald#847

4 files changed, 13 insertions, 13 deletions

diff --git a/asm/battle_anim_effects_2.s b/asm/battle_anim_effects_2.s
index 4fc69864c..24921239f 100644
--- a/asm/battle_anim_effects_2.s
+++ b/asm/battle_anim_effects_2.s
@@ -3902,7 +3902,7 @@ _080A8C60:
 	subs r0, r4
 	strh r0, [r1]
 _080A8C6A:
-	ldr r1, _080A8C80 @ =AnimSparklingParticle
+	ldr r1, _080A8C80 @ =AnimSpriteOnMonPos
 	str r1, [r6, 0x1C]
 	adds r0, r6, 0
 	bl _call_via_r1
@@ -3912,7 +3912,7 @@ _080A8C6A:
 	bx r0
 	.align 2, 0
 _080A8C7C: .4byte gBattleAnimArgs
-_080A8C80: .4byte AnimSparklingParticle
+_080A8C80: .4byte AnimSpriteOnMonPos
 	thumb_func_end sub_80A8BC4
 
 	thumb_func_start sub_80A8C84
@@ -4233,7 +4233,7 @@ _080A8F0E:
 	adds r0, r4, 0
 	movs r1, 0x1
 	bl StartSpriteAffineAnim
-	ldr r1, _080A8F34 @ =AnimSparklingParticle
+	ldr r1, _080A8F34 @ =AnimSpriteOnMonPos
 	str r1, [r4, 0x1C]
 	adds r0, r4, 0
 	bl _call_via_r1
@@ -4244,7 +4244,7 @@ _080A8F0E:
 _080A8F28: .4byte 0x000027db
 _080A8F2C: .4byte 0x01010000
 _080A8F30: .4byte gBattleAnimArgs
-_080A8F34: .4byte AnimSparklingParticle
+_080A8F34: .4byte AnimSpriteOnMonPos
 	thumb_func_end sub_80A8EE8
 
 	thumb_func_start sub_80A8F38
diff --git a/include/battle_anim.h b/include/battle_anim.h
index 7260c1dfb..1eb1a7353 100644
--- a/include/battle_anim.h
+++ b/include/battle_anim.h
@@ -240,9 +240,9 @@ void SetGreyscaleOrOriginalPalette(u16 paletteNum, bool8 restoreOriginalColor);
 u32 sub_8075BE8(u8 battleBackground, u8 attacker, u8 target, u8 attackerPartner, u8 targetPartner, u8 a6, u8 a7);
 u32 sub_8075CB8(u8 a1, u8 a2, u8 a3, u8 a4);
 u8 sub_8075D80(u8 a1);
-void AnimSparklingParticle(struct Sprite *sprite);
+void AnimSpriteOnMonPos(struct Sprite *sprite);
 void TranslateAnimSpriteToTargetMonLocation(struct Sprite *sprite);
-void sub_8075E80(struct Sprite *sprite);
+void AnimThrowProjectile(struct Sprite *sprite);
 void sub_8075F0C(struct Sprite *sprite);
 s16 CloneBattlerSpriteWithBlend(u8 animBattler);
 void obj_delete_but_dont_free_vram(struct Sprite *sprite);
diff --git a/src/battle_anim_mons.c b/src/battle_anim_mons.c
index 7bb62af69..c19af4cb7 100644
--- a/src/battle_anim_mons.c
+++ b/src/battle_anim_mons.c
@@ -28,7 +28,7 @@ static u8 GetBattlerSpriteFinal_Y(u8 battlerId, u16 species, bool8 a3);
 static void sub_8075658(struct Sprite *sprite);
 static void sub_80757E8(struct Sprite *sprite);
 static bool8 sub_80758DC(void);
-static void sub_8075EF0(struct Sprite *sprite);
+static void AnimThrowProjectile_Step(struct Sprite *sprite);
 static void sub_80760D0(u8 taskId);
 static void AnimTask_BlendMonInAndOutSetup(struct Task *task);
 static void AnimTask_BlendMonInAndOutStep(u8 taskId);
@@ -1336,7 +1336,7 @@ static u8 GetBattlerAtPosition_(u8 position)
     return GetBattlerAtPosition(position);
 }
 
-void AnimSparklingParticle(struct Sprite *sprite)
+void AnimSpriteOnMonPos(struct Sprite *sprite)
 {
     bool8 var;
 
@@ -1390,7 +1390,7 @@ void TranslateAnimSpriteToTargetMonLocation(struct Sprite *sprite)
     StoreSpriteCallbackInData6(sprite, DestroyAnimSprite);
 }
 
-void sub_8075E80(struct Sprite *sprite)
+void AnimThrowProjectile(struct Sprite *sprite)
 {
     InitSpritePosToAnimAttacker(sprite, 1);
     if (GetBattlerSide(gBattleAnimAttacker))
@@ -1400,10 +1400,10 @@ void sub_8075E80(struct Sprite *sprite)
     sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y_PIC_OFFSET) + gBattleAnimArgs[3];
     sprite->data[5] = gBattleAnimArgs[5];
     InitAnimArcTranslation(sprite);
-    sprite->callback = sub_8075EF0;
+    sprite->callback = AnimThrowProjectile_Step;
 }
 
-static void sub_8075EF0(struct Sprite *sprite)
+static void AnimThrowProjectile_Step(struct Sprite *sprite)
 {
     if (TranslateAnimHorizontalArc(sprite))
         DestroyAnimSprite(sprite);
diff --git a/src/psychic.c b/src/psychic.c
index b37820d02..a8108c55a 100644
--- a/src/psychic.c
+++ b/src/psychic.c
@@ -47,7 +47,7 @@ const struct SpriteTemplate gUnknown_83E6DF8 =
     .anims = gDummySpriteAnimTable,
     .images = NULL,
     .affineAnims = gUnknown_83E6DF4,
-    .callback = AnimSparklingParticle,
+    .callback = AnimSpriteOnMonPos,
 };
 
 const struct SpriteTemplate gUnknown_83E6E10 =
@@ -376,7 +376,7 @@ const struct SpriteTemplate gUnknown_83E7148 =
     .anims = gDummySpriteAnimTable,
     .images = NULL,
     .affineAnims = gUnknown_83E7144,
-    .callback = AnimSparklingParticle,
+    .callback = AnimSpriteOnMonPos,
 };
 
 static const union AffineAnimCmd gUnknown_83E7160[] =