diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-12-14 23:22:41 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-14 23:22:41 -0500 |
| commit | 15c2856b24c91d1fe4c3d5f3fe4d84d87827f386 (patch) | |
| tree | 3367bb9a7ae8b701acf43cb8df6e137cf94f72bb /src/party_menu.c | |
| parent | c61142188292a0edfe9154a93e440739560490cf (diff) | |
| parent | 69cfe5ad01f135e16c330891d3b6d9fc7853e632 (diff) | |
Merge pull request #1265 from Kurausukun/berry_crush
fakematch fixes, begin documenting Berry Crush (based on #1187)
Diffstat (limited to 'src/party_menu.c')
| -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 da0783d23..f045a9a47 100755 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -1963,19 +1963,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) |