diff --git a/src/data/trainers.c b/src/data/trainers.c index a688974..b3180ad 100644 --- a/src/data/trainers.c +++ b/src/data/trainers.c @@ -4562,12 +4562,12 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tommy[1] = { const struct TrainerMonNoItemDefaultMoves gTrainerParty_Asmodeus[2] = { { .iv = 40, - .level = 16, + .level = 15, .species = SPECIES_ANORITH, }, { .iv = 40, - .level = 17, + .level = 16, .species = SPECIES_ANORITH, }, }; @@ -4584,12 +4584,12 @@ const struct TrainerMonNoItemCustomMoves gTrainerParty_Ben[1] = { const struct TrainerMonNoItemDefaultMoves gTrainerParty_Belial1[2] = { { .iv = 40, - .level = 16, + .level = 14, .species = SPECIES_ANORITH, }, { .iv = 40, - .level = 17, + .level = 15, .species = SPECIES_ANORITH, }, }; @@ -9493,7 +9493,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Leozar[1] = { const struct TrainerMonNoItemDefaultMoves gTrainerParty_Gleis4[1] = { { .iv = 30, - .level = 17, + .level = 14, .species = SPECIES_FACELEECH, }, }; diff --git a/src/pokemon.c b/src/pokemon.c index 7470b92..1605765 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -3,6 +3,7 @@ #include "battle.h" #include "item.h" #include "script_menu.h" +#include "debug.h" #include "constants/items.h" #include "constants/pokemon.h" #include "constants/species.h" @@ -36,8 +37,9 @@ bool8 CheckIfPartyCanUseHM(void) for (i = 0; i < PARTY_SIZE; i++) { u16 species = GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2); - if (!species || species == SPECIES_EGG) - return FALSE; + + if (species == SPECIES_NONE || species == SPECIES_EGG) + continue; if ((CanMonLearnTMHM(&gPlayerParty[i], tm - ITEM_TM01_FOCUS_PUNCH)) || (MonKnowsMove(&gPlayerParty[i], ItemIdToBattleMoveId(tm)) == TRUE))