From 6cb152e45271884603c32d7e227ebeb01261defd Mon Sep 17 00:00:00 2001 From: AgustinGDLV Date: Mon, 16 May 2022 13:51:28 -0700 Subject: [PATCH] removing nonessential stuff --- src/party_menu.c | 12 +++--------- src/pokemon.c | 2 ++ 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/party_menu.c b/src/party_menu.c index 1b1755d0c..f0069300b 100755 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -4824,10 +4824,7 @@ static void Task_LearnNextMoveOrClosePartyMenu(u8 taskId) if (IsFanfareTaskInactive() && ((JOY_NEW(A_BUTTON)) || (JOY_NEW(B_BUTTON)))) { if (gPartyMenu.learnMoveState == 1) - if (sInitialLevel < sFinalLevel) - Task_TryLearnNewMoves(taskId); - else - Task_TryLearningNextMove(taskId); + Task_TryLearningNextMove(taskId); else { if (gPartyMenu.learnMoveState == 2) // never occurs @@ -5088,7 +5085,7 @@ static void Task_TryLearnNewMoves(u8 taskId) switch (learnMove) { case 0: // No moves to learn - if(sInitialLevel >= sFinalLevel) + if (sInitialLevel >= sFinalLevel) PartyMenuTryEvolution(taskId); break; case MON_HAS_MAX_MOVES: @@ -5114,12 +5111,9 @@ static void Task_TryLearningNextMove(u8 taskId) { SetMonData(&gPlayerParty[gPartyMenu.slotId], MON_DATA_LEVEL, &sInitialLevel); result = MonTryLearningNewMove(&gPlayerParty[gPartyMenu.slotId], FALSE); - gPartyMenu.learnMoveState = 1; switch (result) { case 0: // No moves to learn - if(sInitialLevel >= sFinalLevel) - PartyMenuTryEvolution(taskId); break; case MON_HAS_MAX_MOVES: DisplayMonNeedsToReplaceMove(taskId); @@ -5133,7 +5127,7 @@ static void Task_TryLearningNextMove(u8 taskId) if (result) break; } - if(sInitialLevel >= sFinalLevel) + if (sInitialLevel >= sFinalLevel) PartyMenuTryEvolution(taskId); } diff --git a/src/pokemon.c b/src/pokemon.c index a064d6acc..953278846 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -4883,7 +4883,9 @@ bool8 PokemonUseItemEffects(struct Pokemon *mon, u16 item, u8 partyIndex, u8 mov && GetMonData(mon, MON_DATA_LEVEL, NULL) != MAX_LEVEL) { if (ItemId_GetHoldEffectParam(item) & FULL_LEVEL) + { dataUnsigned = gExperienceTables[gBaseStats[GetMonData(mon, MON_DATA_SPECIES, NULL)].growthRate][GetMonData(mon, MON_DATA_LEVEL, NULL) + 1]; + } else { temp1 = ItemId_GetHoldEffectParam(item) & 0x0F;