From b6bc114ef1cbd9c704f014c78d9a1073ec339c5b Mon Sep 17 00:00:00 2001
From: Eduardo Quezada <eduardo602002@gmail.com>
Date: Sun, 4 Sep 2022 20:56:14 -0300
Subject: [PATCH] Review suggestions

---
 src/battle_main.c | 33 +++++++++++++++++++--------------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/src/battle_main.c b/src/battle_main.c
index b727437f1..cb5de711b 100644
--- a/src/battle_main.c
+++ b/src/battle_main.c
@@ -76,7 +76,7 @@ static void CB2_EndLinkBattle(void);
 static void EndLinkBattleInSteps(void);
 static void SpriteCB_MoveWildMonToRight(struct Sprite *sprite);
 static void SpriteCB_WildMonShowHealthbox(struct Sprite *sprite);
-static void SpriteCB_8011E28_Step(struct Sprite *sprite);
+static void SpriteCB_Flicker(struct Sprite *sprite);
 static void SpriteCB_AnimFaintOpponent(struct Sprite *sprite);
 static void SpriteCB_BlinkVisible(struct Sprite *sprite);
 static void oac_poke_ally_(struct Sprite *sprite);
@@ -1917,24 +1917,26 @@ void SpriteCallbackDummy_2(struct Sprite *sprite)
 {
 }
 
-// Unused
-static void SpriteCB_8011E28(struct Sprite *sprite)
-{
-    sprite->data[3] = 6;
-    sprite->data[4] = 1;
-    sprite->callback = SpriteCB_8011E28_Step;
-}
+#define sNumFlickers data[3]
+#define sDelay       data[4]
 
 // Unused
-static void SpriteCB_8011E28_Step(struct Sprite *sprite)
+static void SpriteCB_InitFlicker(struct Sprite *sprite)
 {
-    --sprite->data[4];
-    if (sprite->data[4] == 0)
+    sprite->sNumFlickers = 6;
+    sprite->sDelay = 1;
+    sprite->callback = SpriteCB_Flicker;
+}
+
+static void SpriteCB_Flicker(struct Sprite *sprite)
+{
+    sprite->sDelay--;
+    if (sprite->sDelay == 0)
     {
-        sprite->data[4] = 8;
+        sprite->sDelay = 8;
         sprite->invisible ^= 1;
-        --sprite->data[3];
-        if (sprite->data[3] == 0)
+        sprite->sNumFlickers--;
+        if (sprite->sNumFlickers == 0)
         {
             sprite->invisible = FALSE;
             sprite->callback = SpriteCallbackDummy_2;
@@ -1943,6 +1945,9 @@ static void SpriteCB_8011E28_Step(struct Sprite *sprite)
     }
 }
 
+#undef sNumFlickers
+#undef sDelay
+
 void SpriteCB_FaintOpponentMon(struct Sprite *sprite)
 {
     u8 battler = sprite->sBattler;