diff --git a/src/battle_anim_ice.c b/src/battle_anim_ice.c
index 7579246588..6b48215a7a 100644
--- a/src/battle_anim_ice.c
+++ b/src/battle_anim_ice.c
@@ -1371,9 +1371,9 @@ static void AnimTask_Hail2(u8 taskId)
             if (GenerateHailParticle(task->tHailStructId, task->tHailAffineAnimNum, taskId, 1))
                 task->tSpriteCount++;
 
-            if (++task->tHailAffineAnimNum == 3) // i.e. ARRAY_COUNT(sAffineAnims_HailParticle)
+            if (++task->tHailAffineAnimNum == (int)ARRAY_COUNT(sAffineAnims_HailParticle))
             {
-                if (++task->tHailStructId == 10) // i.e. ARRAY_COUNT(sHailCoordData)
+                if (++task->tHailStructId == (int)ARRAY_COUNT(sHailCoordData))
                     task->tState++;
                 else
                     task->tState--;