diff options
author | Kaz <kazbloxmc@gmail.com> | 2020-09-13 03:02:41 -0400 |
---|---|---|
committer | Kaz <kazbloxmc@gmail.com> | 2020-09-13 03:02:41 -0400 |
commit | f952144922b23d258c6b98ce3da79276d5c1e643 (patch) | |
tree | ebc98ac20afd6fb80f147d354b9b6d28a42d375d /src | |
parent | 449df5860d91570a2b14caf58a51af45c7bbf8d0 (diff) |
party_menu fakematch fix
Diffstat (limited to 'src')
-rwxr-xr-x | src/party_menu.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/party_menu.c b/src/party_menu.c index e509ef6e0..39f74e58d 100755 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -1964,19 +1964,17 @@ static u8 CanMonLearnTMTutor(struct Pokemon *mon, u16 item, u8 tutor) if (item >= ITEM_TM01_FOCUS_PUNCH) { - if (CanMonLearnTMHM(mon, item - ITEM_TM01_FOCUS_PUNCH)) - move = ItemIdToBattleMoveId(item); - else + if (!CanMonLearnTMHM(mon, item - ITEM_TM01_FOCUS_PUNCH)) return CANNOT_LEARN_MOVE; - do {} while (0); // :morphon: - } - else if (CanLearnTutorMove(GetMonData(mon, MON_DATA_SPECIES), tutor) == FALSE) - { - return CANNOT_LEARN_MOVE; + else + move = ItemIdToBattleMoveId(item); } else { - move = GetTutorMove(tutor); + if (!CanLearnTutorMove(GetMonData(mon, MON_DATA_SPECIES), tutor)) + return CANNOT_LEARN_MOVE; + else + move = GetTutorMove(tutor); } if (MonKnowsMove(mon, move) == TRUE) |