Leahnaya/pokeemerald
1
0
Fork 0
mirror of https://github.com/pret/pokeemerald.git synced 2026-10-01 06:17:43 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Consolidated funcs, renamed CanMonLearnMove

Browse Source
This commit is contained in:
crater-git
2022-08-26 11:07:08 -04:00
parent 54ee960970
commit b8a3cc2846
5 changed files with 12 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/apprentice.c
View File

@@ -338,7 +338,7 @@ static u16 GetRandomAlternateMove(u8 monId)
const struct LevelUpMove *learnset;
bool32 needTMs = FALSE;
u16 moveId = MOVE_NONE;
bool32 shouldUseMove;
bool8 shouldUseMove;
u8 level;
id = APPRENTICE_SPECIES_ID(monId);
@@ -376,7 +376,7 @@ static u16 GetRandomAlternateMove(u8 monId)
do
{
id = Random() % (NUM_TECHNICAL_MACHINES + NUM_HIDDEN_MACHINES);
shouldUseMove = CanSpeciesLearnTaughtMove(species, ItemIdToBattleMoveId(ITEM_TM01 + id));
shouldUseMove = CanLearnTaughtMove(species, ItemIdToBattleMoveId(ITEM_TM01 + id));
}
while (!shouldUseMove);