From 5a366e8d72d9156e28819704bdf2d8b23c1b9285 Mon Sep 17 00:00:00 2001
From: Sewef <elagroum@gmail.com>
Date: Mon, 14 Oct 2019 22:51:45 +0200
Subject: [PATCH] More battle_anim_effects_1 labels

---
 data/battle_anim_scripts.s  |  6 +++---
 include/battle_anim.h       |  2 +-
 src/battle_anim_effects_1.c | 20 ++++++++++----------
 src/battle_anim_effects_2.c |  2 +-
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s
index fe0f2a203e..e36f31f648 100644
--- a/data/battle_anim_scripts.s
+++ b/data/battle_anim_scripts.s
@@ -2329,7 +2329,7 @@ Move_CONVERSION:
 	playsewithpan SE_W112, SOUND_PAN_ATTACKER
 	createvisualtask sub_8115D94, 2, ANIM_TAG_CONVERSION, 1, 1, 14335, 12, 0, 0
 	delay 6
-	createvisualtask sub_81022D4, 5
+	createvisualtask AnimTask_ConversionAlphaBlend, 5
 	waitforvisualfinish
 	delay 1
 	clearmonbg ANIM_ATK_PARTNER
@@ -2359,7 +2359,7 @@ Move_CONVERSION_2:
 	createsprite gConversion2SpriteTemplate, ANIM_ATTACKER, 2, -8, 24, 125
 	createsprite gConversion2SpriteTemplate, ANIM_ATTACKER, 2, 8, 24, 130
 	createsprite gConversion2SpriteTemplate, ANIM_ATTACKER, 2, 24, 24, 135
-	createvisualtask sub_81023E0, 5
+	createvisualtask AnimTask_Conversion2AlphaBlend, 5
 	delay 60
 	playsewithpan SE_W129, SOUND_PAN_TARGET
 	delay 10
@@ -3376,7 +3376,7 @@ Move_MOONLIGHT:
 	delay 30
 	createsprite gMoonlightSparkleSpriteTemplate, ANIM_ATTACKER, 40, 10, 0
 	delay 20
-	createvisualtask sub_81025C0, 2
+	createvisualtask AnimTask_FadeScreenBlue, 2
 	waitforvisualfinish
 	call HealingEffect
 	waitforvisualfinish
diff --git a/include/battle_anim.h b/include/battle_anim.h
index f6543267f7..5e1d58075a 100644
--- a/include/battle_anim.h
+++ b/include/battle_anim.h
@@ -221,7 +221,7 @@ void sub_8116EB4(u8);
 void sub_8117854(u8 taskId, int unused, u16 arg2, u8 battler1, u8 arg4, u8 arg5, u8 arg6, u8 arg7, const u32 *arg8, const u32 *arg9, const u32 *palette);
 
 // battle_anim_effects_1.c
-void sub_810310C(u8 battler, struct Sprite* sprite);
+void SetSpriteNextToMonHead(u8 battler, struct Sprite* sprite);
 void AnimMoveTwisterParticle(struct Sprite* sprite);
 
 // water.c
diff --git a/src/battle_anim_effects_1.c b/src/battle_anim_effects_1.c
index 6a2a17393c..84d6585553 100644
--- a/src/battle_anim_effects_1.c
+++ b/src/battle_anim_effects_1.c
@@ -4850,7 +4850,7 @@ void AnimConversion(struct Sprite* sprite)
         DestroyAnimSprite(sprite);
 }
 
-void sub_81022D4(u8 taskId)
+void AnimTask_ConversionAlphaBlend(u8 taskId)
 {
     if (gTasks[taskId].data[2] == 1)
     {
@@ -4899,7 +4899,7 @@ static void AnimConversion2Step(struct Sprite* sprite)
     }
 }
 
-void sub_81023E0(u8 taskId)
+void AnimTask_Conversion2AlphaBlend(u8 taskId)
 {
     if (++gTasks[taskId].data[0] == 4)
     {
@@ -4988,10 +4988,10 @@ static void AnimMoonlightSparkleStep(struct Sprite* sprite)
         DestroyAnimSprite(sprite);
 }
 
-void sub_81026A8(u8);
+void AnimTask_FadeScreenBlueStep(u8);
 
 
-void sub_81025C0(u8 taskId)
+void AnimTask_FadeScreenBlue(u8 taskId)
 {
     int a = sub_80A75AC(1, 0, 0, 0, 0, 0, 0) & 0xFFFF;
     int b;
@@ -5014,11 +5014,11 @@ void sub_81025C0(u8 taskId)
     b = b | (0x10000 << IndexOfSpritePaletteTag(ANIM_TAG_MOON));
     d = IndexOfSpritePaletteTag(ANIM_TAG_GREEN_SPARKLE);
     BeginNormalPaletteFade((0x10000 << d) | b, 0, 0, 16, RGB(27, 29, 31));
-    gTasks[taskId].func = sub_81026A8;
+    gTasks[taskId].func = AnimTask_FadeScreenBlueStep;
     gTasks[taskId].func(taskId);
 }
 
-void sub_81026A8(u8 taskId)
+void AnimTask_FadeScreenBlueStep(u8 taskId)
 {
     struct Task* task = &gTasks[taskId];
     switch (task->data[0])
@@ -5450,7 +5450,7 @@ static void AnimSlowFlyingMusicNotesStep(struct Sprite* sprite)
     }
 }
 
-void sub_810310C(u8 battler, struct Sprite* sprite)
+void SetSpriteNextToMonHead(u8 battler, struct Sprite* sprite)
 {
     if (GetBattlerSide(battler) == B_SIDE_PLAYER)
         sprite->pos1.x = GetBattlerSpriteCoordAttr(battler, BATTLER_COORD_ATTR_RIGHT) + 8;
@@ -5469,7 +5469,7 @@ void AnimThroughtBubble(struct Sprite* sprite)
     else
         battler = gBattleAnimTarget;
 
-    sub_810310C(battler, sprite);
+    SetSpriteNextToMonHead(battler, sprite);
     a = (GetBattlerSide(battler) == B_SIDE_PLAYER) ? 0 : 1;
     sprite->data[0] = gBattleAnimArgs[1];
     sprite->data[1] = a + 2;
@@ -5496,7 +5496,7 @@ void AnimMetronomeFinger(struct Sprite* sprite)
     else
         battler = gBattleAnimTarget;
 
-    sub_810310C(battler, sprite);
+    SetSpriteNextToMonHead(battler, sprite);
     sprite->data[0] = 0;
     StoreSpriteCallbackInData6(sprite, AnimMetronomeFingerStep);
     sprite->callback = RunStoredCallbackWhenAffineAnimEnds;
@@ -5578,7 +5578,7 @@ void AnimTauntFinger(struct Sprite* sprite)
     else
         battler = gBattleAnimTarget;
 
-    sub_810310C(battler, sprite);
+    SetSpriteNextToMonHead(battler, sprite);
     if (GetBattlerSide(battler) == B_SIDE_PLAYER)
     {
         StartSpriteAnim(sprite, 0);
diff --git a/src/battle_anim_effects_2.c b/src/battle_anim_effects_2.c
index 86995c585e..e84d1c746d 100755
--- a/src/battle_anim_effects_2.c
+++ b/src/battle_anim_effects_2.c
@@ -1273,7 +1273,7 @@ void sub_8103498(struct Sprite *sprite)
     else
         battler = gBattleAnimTarget;
 
-    sub_810310C(battler, sprite);
+    SetSpriteNextToMonHead(battler, sprite);
     sprite->data[0] = 0;
     sprite->data[1] = 0;
     sprite->callback = sub_81034D8;