Rename daycare structs to be slightly less insensible

4 files changed, 48 insertions, 53 deletions

diff --git a/include/global.h b/include/global.h
index 43a105162..ac28507e8 100644
--- a/include/global.h
+++ b/include/global.h
@@ -562,16 +562,11 @@ struct GabbyAndTyData
 
 struct DayCareMail
 {
-    /*0x00*/ struct MailStruct mail;
+    /*0x00*/ struct MailStruct message;
     /*0x24*/ u8 names[19];
 };
 
-struct DayCareMailExtra_RecordMixing {
-    u32 unk70;
-    u16 unk74[2];
-};
-
-struct DayCareMailExtra_EggData {
+struct DayCareStepCountersEtc {
     u32 steps[2];
     u16 personalityLo;
     u8 unk_11a;
@@ -579,20 +574,20 @@ struct DayCareMailExtra_EggData {
 
 struct RecordMixingDayCareMail
 {
-    struct DayCareMail data[2];
+    struct DayCareMail mail[2];
     u32 unk70;
     u16 unk74[2];
 };
 
-struct DayCareMailEtc
+struct DayCareMisc
 {
-    struct DayCareMail data[2];
-    struct DayCareMailExtra_EggData egg;
+    struct DayCareMail mail[2];
+    struct DayCareStepCountersEtc countersEtc;
 };
 
 struct DayCareData {
     struct BoxPokemon mons[2];
-    struct DayCareMailEtc mail;
+    struct DayCareMisc misc;
 };
 
 struct LinkBattleRecord
diff --git a/src/daycare.c b/src/daycare.c
index b383667a7..591b5b188 100644
--- a/src/daycare.c
+++ b/src/daycare.c
@@ -114,17 +114,17 @@ static void Daycare_SendPokemon(struct Pokemon * mon, struct DayCareData * dayca
 
     empty_slot = Daycare_FindEmptySpot(daycare_data->mons);
     if(MonHasMail(mon)) {
-        StringCopy((names = daycare_data->mail.data[empty_slot].names), gSaveBlock2.playerName);
+        StringCopy((names = daycare_data->misc.mail[empty_slot].names), gSaveBlock2.playerName);
         PadNameString(names, 0xFC);
         names += 8;
         GetMonNick(mon, names);
         mail = GetMonData(mon, MON_DATA_MAIL);
-        daycare_data->mail.data[empty_slot].mail = gSaveBlock1.mail[mail];
+        daycare_data->misc.mail[empty_slot].message = gSaveBlock1.mail[mail];
         TakeMailFromMon(mon);
     }
     daycare_data->mons[empty_slot] = mon->box;
     BoxMonRestorePP(&daycare_data->mons[empty_slot]);
-    daycare_data->mail.egg.steps[empty_slot] = 0;
+    daycare_data->misc.countersEtc.steps[empty_slot] = 0;
     ZeroMonData(mon);
     party_compaction();
     CalculatePlayerPartyCount();
@@ -141,10 +141,10 @@ static void sub_80414C0(struct DayCareData * daycare_data)
     {
         daycare_data->mons[0] = daycare_data->mons[1];
         ZeroBoxMonData(&daycare_data->mons[1]);
-        daycare_data->mail.data[0] = daycare_data->mail.data[1];
-        daycare_data->mail.egg.steps[0] = daycare_data->mail.egg.steps[1];
-        daycare_data->mail.egg.steps[1] = 0;
-        sub_80417F4(&daycare_data->mail.data[1]);
+        daycare_data->misc.mail[0] = daycare_data->misc.mail[1];
+        daycare_data->misc.countersEtc.steps[0] = daycare_data->misc.countersEtc.steps[1];
+        daycare_data->misc.countersEtc.steps[1] = 0;
+        sub_80417F4(&daycare_data->misc.mail[1]);
     }
 }
 
@@ -157,7 +157,7 @@ static void DayCare_LevelUpMoves(struct Pokemon * mon)
     u8 r6;
     u16 temp;
 
-    for (i = 0; i < 100; i++)
+    for (i = 0; i < MAX_LEVEL; i++)
     {
         if (TryIncrementMonLevel(mon))
         {
@@ -187,19 +187,19 @@ static u16 sub_8041570(struct DayCareData * daycare_data, u8 slot)
     sub_803B4B4(&daycare_data->mons[slot], &pokemon);
     if (GetMonData(&pokemon, MON_DATA_LEVEL) != MAX_LEVEL)
     {
-        experience = GetMonData(&pokemon, MON_DATA_EXP) + daycare_data->mail.egg.steps[slot];
+        experience = GetMonData(&pokemon, MON_DATA_EXP) + daycare_data->misc.countersEtc.steps[slot];
         SetMonData(&pokemon, MON_DATA_EXP, (u8 *)&experience);
         DayCare_LevelUpMoves(&pokemon);
     }
     gPlayerParty[PARTY_SIZE - 1] = pokemon;
-    if (daycare_data->mail.data[slot].mail.itemId)
+    if (daycare_data->misc.mail[slot].message.itemId)
     {
-        GiveMailToMon2(&gPlayerParty[PARTY_SIZE - 1], &daycare_data->mail.data[slot].mail);
-        sub_80417F4(&daycare_data->mail.data[slot]);
+        GiveMailToMon2(&gPlayerParty[PARTY_SIZE - 1], &daycare_data->misc.mail[slot].message);
+        sub_80417F4(&daycare_data->misc.mail[slot]);
     }
     party_compaction();
     ZeroBoxMonData(&daycare_data->mons[slot]);
-    daycare_data->mail.egg.steps[slot] = 0;
+    daycare_data->misc.countersEtc.steps[slot] = 0;
     sub_80414C0(daycare_data);
     CalculatePlayerPartyCount();
     return species;
@@ -223,7 +223,7 @@ static u8 sub_80416A0(struct DayCareData *daycareData, u8 slot)
     u8 levelAfter;
 
     levelBefore = GetLevelFromBoxMonExp(&daycareData->mons[slot]);
-    levelAfter = Daycare_GetLevelAfterSteps(&daycareData->mons[slot], daycareData->mail.egg.steps[slot]);
+    levelAfter = Daycare_GetLevelAfterSteps(&daycareData->mons[slot], daycareData->misc.countersEtc.steps[slot]);
     return levelAfter - levelBefore;
 }
 
@@ -253,8 +253,8 @@ void sub_8041770(void)
 
 void sub_8041790(u16 i)
 {
-    gSaveBlock1.daycareData.mail.egg.steps[0] += i;
-    gSaveBlock1.daycareData.mail.egg.steps[1] += i;
+    gSaveBlock1.daycareData.misc.countersEtc.steps[0] += i;
+    gSaveBlock1.daycareData.misc.countersEtc.steps[1] += i;
 }
 
 u8 sub_80417B8(void)
@@ -277,7 +277,7 @@ static void sub_80417F4(struct DayCareMail *mail)
     zero = 0;
     names = mail->names + 18;
     do *names-- = zero; while ((int)names >= (int)names2);
-    ClearMailStruct(&mail->mail);
+    ClearMailStruct(&mail->message);
 }
 
 void unref_sub_8041824(struct DayCareData *dayCareData)
@@ -286,11 +286,11 @@ void unref_sub_8041824(struct DayCareData *dayCareData)
     for (slot = 0; slot < ARRAY_COUNT(dayCareData->mons); slot ++)
     {
         ZeroBoxMonData(&dayCareData->mons[slot]);
-        dayCareData->mail.egg.steps[slot] = 0;
-        sub_80417F4(&dayCareData->mail.data[slot]);
+        dayCareData->misc.countersEtc.steps[slot] = 0;
+        sub_80417F4(&dayCareData->misc.mail[slot]);
     }
-    dayCareData->mail.egg.personalityLo = 0;
-    dayCareData->mail.egg.unk_11a = 0;
+    dayCareData->misc.countersEtc.personalityLo = 0;
+    dayCareData->misc.countersEtc.unk_11a = 0;
 }
 
 u16 sub_8041870(u16 species)
@@ -322,13 +322,13 @@ u16 sub_8041870(u16 species)
 
 static void sub_80418F0(struct DayCareData *dayCareData)
 {
-    dayCareData->mail.egg.personalityLo = (Random() % 0xfffe) + 1;
+    dayCareData->misc.countersEtc.personalityLo = (Random() % 0xfffe) + 1;
     FlagSet(0x86);
 }
 
 static void sub_804191C(struct DayCareData *dayCareData)
 {
-    dayCareData->mail.egg.personalityLo = Random() | 0x8000;
+    dayCareData->misc.countersEtc.personalityLo = Random() | 0x8000;
     FlagSet(0x86);
 }
 
@@ -864,8 +864,8 @@ void daycare_build_child_moveset(struct Pokemon *egg, struct BoxPokemon *dad, st
 
 static void RemoveEggFromDayCare(struct DayCareData *dayCareData)
 {
-    dayCareData->mail.egg.personalityLo = 0;
-    dayCareData->mail.egg.unk_11a = 0;
+    dayCareData->misc.countersEtc.personalityLo = 0;
+    dayCareData->misc.countersEtc.unk_11a = 0;
 }
 
 void sub_8041E7C(void)
@@ -912,11 +912,11 @@ static u16 sub_8041EEC(struct DayCareData *dayCareData, u8 *a1) // inherit_speci
         }
     }
     eggSpecies = sub_8041870(species[a1[0]]);
-    if (eggSpecies == SPECIES_NIDORAN_F && dayCareData->mail.egg.personalityLo & 0x8000)
+    if (eggSpecies == SPECIES_NIDORAN_F && dayCareData->misc.countersEtc.personalityLo & 0x8000)
     {
         eggSpecies = SPECIES_NIDORAN_M;
     }
-    if (eggSpecies == SPECIES_ILLUMISE && dayCareData->mail.egg.personalityLo & 0x8000)
+    if (eggSpecies == SPECIES_ILLUMISE && dayCareData->misc.countersEtc.personalityLo & 0x8000)
     {
         eggSpecies = SPECIES_VOLBEAT;
     }
@@ -980,7 +980,7 @@ static void sub_80420FC(struct Pokemon *mon, u16 species, struct DayCareData *da
     u16 ball;
     u8 metLevel;
     u8 language;
-    personality = dayCareData->mail.egg.personalityLo | (Random() << 16);
+    personality = dayCareData->misc.countersEtc.personalityLo | (Random() << 16);
     CreateMon(mon, species, 5, 0x20, TRUE, personality, FALSE, 0);
     metLevel = 0;
     ball = ITEM_POKE_BALL;
@@ -1009,15 +1009,15 @@ static bool8 sub_80421B0(struct DayCareData *dayCareData)
     {
         if (GetBoxMonData(parent, MON_DATA_SANITY_BIT2, v0))
         {
-            dayCareData->mail.egg.steps[i]++;
+            dayCareData->misc.countersEtc.steps[i]++;
             v0++;
         }
     }
-    if (dayCareData->mail.egg.personalityLo == 0 && v0 == 2 && dayCareData->mail.extra.misc[4] == 0xff && daycare_relationship_score(dayCareData) > (u32)((u32)(Random() * 100) / 0xffff))
+    if (dayCareData->misc.countersEtc.personalityLo == 0 && v0 == 2 && dayCareData->misc.extra.misc[4] == 0xff && daycare_relationship_score(dayCareData) > (u32)((u32)(Random() * 100) / 0xffff))
     {
         sub_8041940();
     }
-    if ((++dayCareData->mail.egg.unk_11a) == 0xff)
+    if ((++dayCareData->misc.countersEtc.unk_11a) == 0xff)
     {
         for (i=0; i<gPlayerPartyCount; i++)
         {
@@ -1168,7 +1168,7 @@ bool8 sub_80422A0(void)
 
 static bool8 sub_80422B4(struct DayCareData *dayCareData)
 {
-    return (u32)((-dayCareData->mail.egg.personalityLo) | dayCareData->mail.egg.personalityLo) >> 31;
+    return (u32)((-dayCareData->misc.countersEtc.personalityLo) | dayCareData->misc.countersEtc.personalityLo) >> 31;
 }
 
 static void sub_80422C4(struct DayCareData *dayCareData)
@@ -1618,7 +1618,7 @@ static void DaycareLevelMenuGetLevelText(struct DayCareData *dayCareData, u8 *de
     *dest = EOS;
     for (i = 0; i < 2; i ++)
     {
-        level = Daycare_GetLevelAfterSteps(&dayCareData->mons[i], dayCareData->mail.egg.steps[i]);
+        level = Daycare_GetLevelAfterSteps(&dayCareData->mons[i], dayCareData->misc.countersEtc.steps[i]);
         dest[0] = 0x34;
         dest[1] = 0xFC;
         dest[2] = 0x14;
diff --git a/src/mori_debug_menu.c b/src/mori_debug_menu.c
index 62837c8e6..1595ecd2e 100644
--- a/src/mori_debug_menu.c
+++ b/src/mori_debug_menu.c
@@ -117,7 +117,7 @@ s8 MoriDebugMenu_BreedEgg(void)
             SetMonData(&gPlayerParty[loopCounter], MON_DATA_FRIENDSHIP, &friendship);
         }
     }
-    gSaveBlock1.daycareData.mail.egg.unk_11a = -3;
+    gSaveBlock1.daycareData.misc.countersEtc.unk_11a = -3;
     CloseMenu();
     return 1;
 }
diff --git a/src/record_mixing.c b/src/record_mixing.c
index 57c7cff1d..8dff432c1 100644
--- a/src/record_mixing.c
+++ b/src/record_mixing.c
@@ -74,8 +74,8 @@ void RecordMixing_PrepareExchangePacket(void)
     memcpy(unk_2018000.filler1004, gUnknown_083D0274, sizeof(unk_2008000.filler1004));
     memcpy(unk_2018000.filler1044, gUnknown_083D0278, sizeof(unk_2008000.filler1044));
     memcpy(unk_2018000.easyChatPairs, recordMixingEasyChatPairs, sizeof(unk_2018000.easyChatPairs));
-    gUnknown_02038738.data[0] = gSaveBlock1.daycareData.mail.data[0];
-    gUnknown_02038738.data[1] = gSaveBlock1.daycareData.mail.data[1];
+    gUnknown_02038738.mail[0] = gSaveBlock1.daycareData.misc.mail[0];
+    gUnknown_02038738.mail[1] = gSaveBlock1.daycareData.misc.mail[1];
     sub_8041324(gSaveBlock1.daycareData.mons, &gUnknown_02038738);
     memcpy(&unk_2018000.filler10AC, gUnknown_083D0280, sizeof(struct RecordMixingDayCareMail));
     memcpy(unk_2018000.filler1124, gUnknown_083D0284, sizeof(unk_2018000.filler1124));
@@ -511,7 +511,7 @@ void sub_80B9C6C(u8 *a, u32 b, u8 c, void *d)
     u16 i;  // r3
     u16 r7;
     u8 r1;
-    struct DayCareMailEtc *r6;
+    struct DayCareMisc *r6;
 
     //asm("":::"r8");
     SeedRng(gLinkPlayers[0].trainerId);
@@ -526,7 +526,7 @@ void sub_80B9C6C(u8 *a, u32 b, u8 c, void *d)
     sp3C = 0;
     for (i = 0; i < r8; i++)
     {
-        r6 = (struct DayCareMailEtc *)(a + b * i);
+        r6 = (struct DayCareMisc *)(a + b * i);
         if (r6->unk70 != 0)
         {
             for (r7 = 0; r7 < r6->unk70; r7++)
@@ -540,7 +540,7 @@ void sub_80B9C6C(u8 *a, u32 b, u8 c, void *d)
     //_080B9D46
     for (r7 = 0, i = 0; i < r8; i++)
     {
-        r6 = (struct DayCareMailEtc *)(a + b * i);
+        r6 = (struct DayCareMisc *)(a + b * i);
         if (sp1C[i][0] == 1 || sp1C[i][1] == 1)
             sp3C++;
         if (sp1C[i][0] == 1 && sp1C[i][1] == 0)
@@ -596,7 +596,7 @@ void sub_80B9C6C(u8 *a, u32 b, u8 c, void *d)
     //_080B9E3E
     for (i = 0; i < 4; i++)
     {
-        r6 = (struct DayCareMailEtc *)a + b * c;
+        r6 = (struct DayCareMisc *)a + b * c;
         spC[i] = r6;
     }
     r1 = sub_80B9C4C(d) % 3;
@@ -630,7 +630,7 @@ void sub_80B9C6C(u8 *a, u32 b, u8 c, void *d)
     //_080B9EF0
     //memcpy(&gSaveBlock1.filler_303C.data[0], a + b * c, 0x38);
     //memcpy(&gSaveBlock1.filler_303C.data[1], a + b * c + 0x38, 0x38);
-    r6 = (struct DayCareMailEtc *)(a + b * c);
+    r6 = (struct DayCareMisc *)(a + b * c);
     gSaveBlock1.filler_303C.data[0] = r6->data[0];
     gSaveBlock1.filler_303C.data[1] = r6->data[1];
     //memcpy(&gSaveBlock1.filler_303C.data[0], &r6->data[0], 0x38);