Port/decompile field_control_avatar
This commit is contained in:
+3
-3
@@ -241,7 +241,7 @@ static void ApplyDaycareExperience(struct Pokemon *mon)
|
||||
bool8 firstMove;
|
||||
u16 learnedMove;
|
||||
|
||||
for (i = 0; i < MAX_MON_LEVEL; i++)
|
||||
for (i = 0; i < MAX_LEVEL; i++)
|
||||
{
|
||||
// Add the mon's gained daycare experience level by level until it can't level up anymore.
|
||||
if (TryIncrementMonLevel(mon))
|
||||
@@ -278,7 +278,7 @@ static u16 TakeSelectedPokemonFromDaycare(struct DaycareMon *daycareMon)
|
||||
species = GetBoxMonData(&daycareMon->mon, MON_DATA_SPECIES);
|
||||
BoxMonToMon(&daycareMon->mon, &pokemon);
|
||||
|
||||
if (GetMonData(&pokemon, MON_DATA_LEVEL) != MAX_MON_LEVEL)
|
||||
if (GetMonData(&pokemon, MON_DATA_LEVEL) != MAX_LEVEL)
|
||||
{
|
||||
experience = GetMonData(&pokemon, MON_DATA_EXP) + daycareMon->steps;
|
||||
SetMonData(&pokemon, MON_DATA_EXP, &experience);
|
||||
@@ -949,7 +949,7 @@ static bool8 _DoEggActions_CheckHatch(struct DayCare *daycare)
|
||||
return FALSE; // no hatching
|
||||
}
|
||||
|
||||
bool8 DoEggActions_CheckHatch(void)
|
||||
bool8 ShouldEggHatch(void)
|
||||
{
|
||||
return _DoEggActions_CheckHatch(&gSaveBlock1Ptr->daycare);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user