1 files changed, 21 insertions, 21 deletions

diff --git a/src/battle_pike.c b/src/battle_pike.c
index f6745e8c9..81951ac98 100644
--- a/src/battle_pike.c
+++ b/src/battle_pike.c
@@ -64,7 +64,7 @@ static void GetRoomInflictedStatus(void);
 static void GetRoomInflictedStatusMon(void);
 static void HealOneOrTwoMons(void);
 static void BufferNPCMessage(void);
-static void StatusInflictionScreenFade(void);
+static void StatusInflictionScreenFlash(void);
 static void GetInBattlePike(void);
 static void SetHintedRoom(void);
 static void GetHintedRoomIndex(void);
@@ -83,7 +83,7 @@ static void PrepareOneTrainer(bool8 difficult);
 static u16 GetNPCRoomGraphicsId(void);
 static void PrepareTwoTrainers(void);
 static void TryHealMons(u8 healCount);
-static void Task_DoStatusInflictionScreenFade(u8 taskId);
+static void Task_DoStatusInflictionScreenFlash(u8 taskId);
 static bool8 AtLeastTwoAliveMons(void);
 static u8 SpeciesToPikeMonId(u16 species);
 static bool8 CanEncounterWildMon(u8 monLevel);
@@ -495,7 +495,7 @@ static void (* const sBattlePikeFunctions[])(void) =
     [BATTLE_PIKE_FUNC_GET_ROOM_STATUS_MON]     = GetRoomInflictedStatusMon,
     [BATTLE_PIKE_FUNC_HEAL_ONE_TWO_MONS]       = HealOneOrTwoMons,
     [BATTLE_PIKE_FUNC_BUFFER_NPC_MSG]          = BufferNPCMessage,
-    [BATTLE_PIKE_FUNC_STATUS_SCREEN_FADE]      = StatusInflictionScreenFade,
+    [BATTLE_PIKE_FUNC_STATUS_SCREEN_FLASH]     = StatusInflictionScreenFlash,
     [BATTLE_PIKE_FUNC_IS_IN]                   = GetInBattlePike,
     [BATTLE_PIKE_FUNC_SET_HINT_ROOM]           = SetHintedRoom,
     [BATTLE_PIKE_FUNC_GET_HINT_ROOM_ID]        = GetHintedRoomIndex,
@@ -533,7 +533,7 @@ static const u8 sNumMonsToHealBeforePikeQueen[][3] =
     {0, 1, 2},
 };
 
-static bool8 (* const sStatusInflictionScreenFadeFuncs[])(struct Task *) =
+static bool8 (* const sStatusInflictionScreenFlashFuncs[])(struct Task *) =
 {
     StatusInflictionFadeOut, StatusInflictionFadeIn
 };
@@ -579,7 +579,7 @@ static void SetupRoomObjectEvents(void)
         break;
     case PIKE_ROOM_STATUS:
         objGfx1 = OBJ_EVENT_GFX_GENTLEMAN;
-        if (sStatusMon == PIKE_STATUS_DUSCLOPS)
+        if (sStatusMon == PIKE_STATUSMON_DUSCLOPS)
             objGfx2 = OBJ_EVENT_GFX_DUSCLOPS;
         else
             objGfx2 = OBJ_EVENT_GFX_KIRLIA;
@@ -774,9 +774,9 @@ static void BufferNPCMessage(void)
     FrontierSpeechToString(sNPCSpeeches[speechId]);
 }
 
-static void StatusInflictionScreenFade(void)
+static void StatusInflictionScreenFlash(void)
 {
-    CreateTask(Task_DoStatusInflictionScreenFade, 2);
+    CreateTask(Task_DoStatusInflictionScreenFlash, 2);
 }
 
 static void HealMon(struct Pokemon *mon)
@@ -946,19 +946,19 @@ static bool8 TryInflictRandomStatus(void)
     switch (sStatusFlags)
     {
     case STATUS1_FREEZE:
-        sStatusMon = PIKE_STATUS_DUSCLOPS;
+        sStatusMon = PIKE_STATUSMON_DUSCLOPS;
         break;
     case STATUS1_BURN:
         if (Random() % 2 != 0)
-            sStatusMon = PIKE_STATUS_DUSCLOPS;
+            sStatusMon = PIKE_STATUSMON_DUSCLOPS;
         else
-            sStatusMon = PIKE_STATUS_KIRLIA;
+            sStatusMon = PIKE_STATUSMON_KIRLIA;
         break;
     case STATUS1_PARALYSIS:
     case STATUS1_SLEEP:
     case STATUS1_TOXIC_POISON:
     default:
-        sStatusMon = PIKE_STATUS_KIRLIA;
+        sStatusMon = PIKE_STATUSMON_KIRLIA;
         break;
     }
 
@@ -1172,9 +1172,9 @@ u8 GetBattlePikeWildMonHeaderId(void)
     return headerId;
 }
 
-static void DoStatusInflictionScreenFade(u8 taskId)
+static void DoStatusInflictionScreenFlash(u8 taskId)
 {
-    while (sStatusInflictionScreenFadeFuncs[gTasks[taskId].data[0]](&gTasks[taskId]));
+    while (sStatusInflictionScreenFlashFuncs[gTasks[taskId].data[0]](&gTasks[taskId]));
 }
 
 static bool8 StatusInflictionFadeOut(struct Task *task)
@@ -1211,7 +1211,7 @@ static bool8 StatusInflictionFadeIn(struct Task *task)
     {
         if (--task->data[3] == 0)
         {
-            DestroyTask(FindTaskIdByFunc(DoStatusInflictionScreenFade));
+            DestroyTask(FindTaskIdByFunc(DoStatusInflictionScreenFlash));
         }
         else
         {
@@ -1222,9 +1222,9 @@ static bool8 StatusInflictionFadeIn(struct Task *task)
     return FALSE;
 }
 
-static void StartStatusInflictionScreenFade(s16 fadeOutDelay, s16 fadeInDelay, s16 numFades, s16 fadeOutSpeed, s16 fadeInSpped)
+static void StartStatusInflictionScreenFlash(s16 fadeOutDelay, s16 fadeInDelay, s16 numFades, s16 fadeOutSpeed, s16 fadeInSpped)
 {
-    u8 taskId = CreateTask(DoStatusInflictionScreenFade, 3);
+    u8 taskId = CreateTask(DoStatusInflictionScreenFlash, 3);
 
     gTasks[taskId].data[1] = fadeOutDelay;
     gTasks[taskId].data[2] = fadeInDelay;
@@ -1234,24 +1234,24 @@ static void StartStatusInflictionScreenFade(s16 fadeOutDelay, s16 fadeInDelay, s
     gTasks[taskId].data[6] = fadeOutDelay;
 }
 
-static bool8 IsStatusInflictionScreenFadeTaskFinished(void)
+static bool8 IsStatusInflictionScreenFlashTaskFinished(void)
 {
-    if (FindTaskIdByFunc(DoStatusInflictionScreenFade) == 0xFF)
+    if (FindTaskIdByFunc(DoStatusInflictionScreenFlash) == 0xFF)
         return TRUE;
     else
         return FALSE;
 }
 
-static void Task_DoStatusInflictionScreenFade(u8 taskId)
+static void Task_DoStatusInflictionScreenFlash(u8 taskId)
 {
     if (gTasks[taskId].data[0] == 0)
     {
         gTasks[taskId].data[0]++;
-        StartStatusInflictionScreenFade(0, 0, 3, 2, 2);
+        StartStatusInflictionScreenFlash(0, 0, 3, 2, 2);
     }
     else
     {
-        if (IsStatusInflictionScreenFadeTaskFinished())
+        if (IsStatusInflictionScreenFlashTaskFinished())
         {
             EnableBothScriptContexts();
             DestroyTask(taskId);