diff --git a/include/pokemon.h b/include/pokemon.h index 1f7003fe39..90450e0a13 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -658,8 +658,6 @@ void SetMonMoveSlot(struct Pokemon *mon, u16 move, u8 slot); void SetBattleMonMoveSlot(struct BattlePokemon *mon, u16 move, u8 slot); void GiveMonInitialMoveset(struct Pokemon *mon); void GiveBoxMonInitialMoveset(struct BoxPokemon *boxMon); -void GiveMonInitialMoveset_Fast(struct Pokemon *mon); -void GiveBoxMonInitialMoveset_Fast(struct BoxPokemon *boxMon); u16 MonTryLearningNewMove(struct Pokemon *mon, bool8 firstMove); void DeleteFirstMoveAndGiveMoveToMon(struct Pokemon *mon, u16 move); void DeleteFirstMoveAndGiveMoveToBoxMon(struct BoxPokemon *boxMon, u16 move); diff --git a/src/debug.c b/src/debug.c index 76fd85fdcd..92972c289e 100644 --- a/src/debug.c +++ b/src/debug.c @@ -4102,7 +4102,7 @@ static void DebugAction_PCBag_Fill_PCBoxes_Fast(u8 taskId) //Credit: Sierraffini StringCopy(speciesName, GetSpeciesName(species)); SetBoxMonData(&boxMon, MON_DATA_NICKNAME, &speciesName); SetBoxMonData(&boxMon, MON_DATA_SPECIES, &species); - GiveBoxMonInitialMoveset_Fast(&boxMon); + GiveBoxMonInitialMoveset(&boxMon); gPokemonStoragePtr->boxes[boxId][boxPosition] = boxMon; } } diff --git a/src/pokemon.c b/src/pokemon.c index be3feba37f..7c2b749f12 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -1678,30 +1678,7 @@ void GiveMonInitialMoveset(struct Pokemon *mon) GiveBoxMonInitialMoveset(&mon->box); } -void GiveBoxMonInitialMoveset(struct BoxPokemon *boxMon) -{ - u16 species = GetBoxMonData(boxMon, MON_DATA_SPECIES, NULL); - s32 level = GetLevelFromBoxMonExp(boxMon); - s32 i; - const struct LevelUpMove *learnset = GetSpeciesLevelUpLearnset(species); - - for (i = 0; learnset[i].move != LEVEL_UP_MOVE_END; i++) - { - if (learnset[i].level > level) - break; - if (learnset[i].level == 0) - continue; - if (GiveMoveToBoxMon(boxMon, learnset[i].move) == MON_HAS_MAX_MOVES) - DeleteFirstMoveAndGiveMoveToBoxMon(boxMon, learnset[i].move); - } -} - -void GiveMonInitialMoveset_Fast(struct Pokemon *mon) -{ - GiveBoxMonInitialMoveset_Fast(&mon->box); -} - -void GiveBoxMonInitialMoveset_Fast(struct BoxPokemon *boxMon) //Credit: AsparagusEduardo +void GiveBoxMonInitialMoveset(struct BoxPokemon *boxMon) //Credit: AsparagusEduardo { u16 species = GetBoxMonData(boxMon, MON_DATA_SPECIES, NULL); s32 level = GetLevelFromBoxMonExp(boxMon);