From e27c3d2abdce7e88e6110e5633a4c88f4065799b Mon Sep 17 00:00:00 2001
From: GriffinR <griffin.g.richards@gmail.com>
Date: Wed, 27 May 2020 16:41:23 -0400
Subject: [PATCH] Clear up misleading egg step name

---
 include/egg_hatch.h |  2 +-
 src/daycare.c       | 18 +++++++++---------
 src/egg_hatch.c     |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/include/egg_hatch.h b/include/egg_hatch.h
index 64d07c813f..4df2a6a408 100644
--- a/include/egg_hatch.h
+++ b/include/egg_hatch.h
@@ -4,7 +4,7 @@
 void ScriptHatchMon(void);
 bool8 CheckDaycareMonReceivedMail(void);
 void EggHatch(void);
-u8 GetEggStepsToSubtract(void);
+u8 GetEggCyclesToSubtract(void);
 u16 CountPartyAliveNonEggMons(void);
 
 #endif // GUARD_EGG_HATCH_H
diff --git a/src/daycare.c b/src/daycare.c
index dcbadeba8d..5d44804039 100644
--- a/src/daycare.c
+++ b/src/daycare.c
@@ -892,11 +892,11 @@ static bool8 TryProduceOrHatchEgg(struct DayCare *daycare)
             TriggerPendingDaycareEgg();
     }
 
-    // Hatch Egg
+    // Try to hatch Egg
     if (++daycare->stepCounter == 255)
     {
-        u32 steps;
-        u8 toSub = GetEggStepsToSubtract();
+        u32 eggCycles;
+        u8 toSub = GetEggCyclesToSubtract();
 
         for (i = 0; i < gPlayerPartyCount; i++)
         {
@@ -905,15 +905,15 @@ static bool8 TryProduceOrHatchEgg(struct DayCare *daycare)
             if (GetMonData(&gPlayerParty[i], MON_DATA_SANITY_IS_BAD_EGG))
                 continue;
 
-            steps = GetMonData(&gPlayerParty[i], MON_DATA_FRIENDSHIP);
-            if (steps != 0)
+            eggCycles = GetMonData(&gPlayerParty[i], MON_DATA_FRIENDSHIP);
+            if (eggCycles != 0)
             {
-                if (steps >= toSub)
-                    steps -= toSub;
+                if (eggCycles >= toSub)
+                    eggCycles -= toSub;
                 else
-                    steps -= 1;
+                    eggCycles -= 1;
 
-                SetMonData(&gPlayerParty[i], MON_DATA_FRIENDSHIP, &steps);
+                SetMonData(&gPlayerParty[i], MON_DATA_FRIENDSHIP, &eggCycles);
             }
             else 
             {
diff --git a/src/egg_hatch.c b/src/egg_hatch.c
index 3bc35bc4af..a6c39f12bf 100644
--- a/src/egg_hatch.c
+++ b/src/egg_hatch.c
@@ -865,7 +865,7 @@ static void EggHatchPrintMessage(u8 windowId, u8* string, u8 x, u8 y, u8 speed)
     AddTextPrinterParameterized4(windowId, 1, x, y, 0, 0, sEggHatchData->textColor, speed, string);
 }
 
-u8 GetEggStepsToSubtract(void)
+u8 GetEggCyclesToSubtract(void)
 {
     u8 count, i;
     for (count = CalculatePlayerPartyCount(), i = 0; i < count; i++)