summaryrefslogtreecommitdiff
path: root/src/daycare.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/daycare.c')
-rw-r--r--src/daycare.c66
1 files changed, 33 insertions, 33 deletions
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;
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-06 01:12:50 +0000