ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-04 00:23:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

removing nonessential stuff

Browse Source
This commit is contained in:
AgustinGDLV 2022-05-16 13:51:28 -07:00
parent 0de15db564
commit 6cb152e452
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/party_menu.c
View File

@ -4824,10 +4824,7 @@ static void Task_LearnNextMoveOrClosePartyMenu(u8 taskId)
if (IsFanfareTaskInactive() && ((JOY_NEW(A_BUTTON)) || (JOY_NEW(B_BUTTON)))) if (IsFanfareTaskInactive() && ((JOY_NEW(A_BUTTON)) || (JOY_NEW(B_BUTTON))))
{ {
if (gPartyMenu.learnMoveState == 1) if (gPartyMenu.learnMoveState == 1)
if (sInitialLevel < sFinalLevel) Task_TryLearningNextMove(taskId);
Task_TryLearnNewMoves(taskId);
else
Task_TryLearningNextMove(taskId);
else else
{ {
if (gPartyMenu.learnMoveState == 2) // never occurs if (gPartyMenu.learnMoveState == 2) // never occurs
@ -5088,7 +5085,7 @@ static void Task_TryLearnNewMoves(u8 taskId)
switch (learnMove) switch (learnMove)
{ {
case 0: // No moves to learn case 0: // No moves to learn
if(sInitialLevel >= sFinalLevel) if (sInitialLevel >= sFinalLevel)
PartyMenuTryEvolution(taskId); PartyMenuTryEvolution(taskId);
break; break;
case MON_HAS_MAX_MOVES: case MON_HAS_MAX_MOVES:
@ -5114,12 +5111,9 @@ static void Task_TryLearningNextMove(u8 taskId)
{ {
SetMonData(&gPlayerParty[gPartyMenu.slotId], MON_DATA_LEVEL, &sInitialLevel); SetMonData(&gPlayerParty[gPartyMenu.slotId], MON_DATA_LEVEL, &sInitialLevel);
result = MonTryLearningNewMove(&gPlayerParty[gPartyMenu.slotId], FALSE); result = MonTryLearningNewMove(&gPlayerParty[gPartyMenu.slotId], FALSE);
gPartyMenu.learnMoveState = 1;
switch (result) switch (result)
{ {
case 0: // No moves to learn case 0: // No moves to learn
if(sInitialLevel >= sFinalLevel)
PartyMenuTryEvolution(taskId);
break; break;
case MON_HAS_MAX_MOVES: case MON_HAS_MAX_MOVES:
DisplayMonNeedsToReplaceMove(taskId); DisplayMonNeedsToReplaceMove(taskId);
@ -5133,7 +5127,7 @@ static void Task_TryLearningNextMove(u8 taskId)
if (result) if (result)
break; break;
} }
if(sInitialLevel >= sFinalLevel) if (sInitialLevel >= sFinalLevel)
PartyMenuTryEvolution(taskId); PartyMenuTryEvolution(taskId);
} }

2
src/pokemon.c
View File

@ -4883,7 +4883,9 @@ bool8 PokemonUseItemEffects(struct Pokemon *mon, u16 item, u8 partyIndex, u8 mov
&& GetMonData(mon, MON_DATA_LEVEL, NULL) != MAX_LEVEL) && GetMonData(mon, MON_DATA_LEVEL, NULL) != MAX_LEVEL)
{ {
if (ItemId_GetHoldEffectParam(item) & FULL_LEVEL) if (ItemId_GetHoldEffectParam(item) & FULL_LEVEL)
{
dataUnsigned = gExperienceTables[gBaseStats[GetMonData(mon, MON_DATA_SPECIES, NULL)].growthRate][GetMonData(mon, MON_DATA_LEVEL, NULL) + 1]; dataUnsigned = gExperienceTables[gBaseStats[GetMonData(mon, MON_DATA_SPECIES, NULL)].growthRate][GetMonData(mon, MON_DATA_LEVEL, NULL) + 1];
}
else else
{ {
temp1 = ItemId_GetHoldEffectParam(item) & 0x0F; temp1 = ItemId_GetHoldEffectParam(item) & 0x0F;