ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-16 19:47:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2005 from LOuroboros/evoMoves

Browse Source 
Implemented evolution moves
This commit is contained in:
Eduardo Quezada D'Ottone 2021-12-26 17:24:37 -03:00 committed by GitHub
commit e405bd8ad3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/pokemon.h
View File

@ -456,5 +456,6 @@ u16 GetFormSpeciesId(u16 speciesId, u8 formId);
u8 GetFormIdFromFormSpeciesId(u16 formSpeciesId); u8 GetFormIdFromFormSpeciesId(u16 formSpeciesId);
u16 GetFormChangeTargetSpecies(struct Pokemon *mon, u16 method, u32 arg); u16 GetFormChangeTargetSpecies(struct Pokemon *mon, u16 method, u32 arg);
u16 GetFormChangeTargetSpeciesBoxMon(struct BoxPokemon *mon, u16 method, u32 arg); u16 GetFormChangeTargetSpeciesBoxMon(struct BoxPokemon *mon, u16 method, u32 arg);
u16 MonTryLearningNewMoveEvolution(struct Pokemon *mon, bool8 firstMove);
#endif // GUARD_POKEMON_H #endif // GUARD_POKEMON_H

4
src/evolution_scene.c
View File

@ -780,7 +780,7 @@ static void Task_EvolutionScene(u8 taskId)
case EVOSTATE_TRY_LEARN_MOVE: case EVOSTATE_TRY_LEARN_MOVE:
if (!IsTextPrinterActive(0)) if (!IsTextPrinterActive(0))
{ {
var = MonTryLearningNewMove(mon, gTasks[taskId].tLearnsFirstMove); var = MonTryLearningNewMoveEvolution(mon, gTasks[taskId].tLearnsFirstMove);
if (var != MOVE_NONE && !gTasks[taskId].tEvoWasStopped) if (var != MOVE_NONE && !gTasks[taskId].tEvoWasStopped)
{ {
u8 text[20]; u8 text[20];
@ -1201,7 +1201,7 @@ static void Task_TradeEvolutionScene(u8 taskId)
case T_EVOSTATE_TRY_LEARN_MOVE: case T_EVOSTATE_TRY_LEARN_MOVE:
if (!IsTextPrinterActive(0) && IsFanfareTaskInactive() == TRUE) if (!IsTextPrinterActive(0) && IsFanfareTaskInactive() == TRUE)
{ {
var = MonTryLearningNewMove(mon, gTasks[taskId].tLearnsFirstMove); var = MonTryLearningNewMoveEvolution(mon, gTasks[taskId].tLearnsFirstMove);
if (var != MOVE_NONE && !gTasks[taskId].tEvoWasStopped) if (var != MOVE_NONE && !gTasks[taskId].tEvoWasStopped)
{ {
u8 text[20]; u8 text[20];

28
src/pokemon.c
View File

@ -3940,6 +3940,8 @@ void GiveBoxMonInitialMoveset(struct BoxPokemon *boxMon)
{ {
if (gLevelUpLearnsets[species][i].level > level) if (gLevelUpLearnsets[species][i].level > level)
break; break;
if (gLevelUpLearnsets[species][i].level == 0)
continue;
if (GiveMoveToBoxMon(boxMon, gLevelUpLearnsets[species][i].move) == MON_HAS_MAX_MOVES) if (GiveMoveToBoxMon(boxMon, gLevelUpLearnsets[species][i].move) == MON_HAS_MAX_MOVES)
DeleteFirstMoveAndGiveMoveToBoxMon(boxMon, gLevelUpLearnsets[species][i].move); DeleteFirstMoveAndGiveMoveToBoxMon(boxMon, gLevelUpLearnsets[species][i].move);
} }
@ -8259,3 +8261,29 @@ u16 GetFormChangeTargetSpeciesBoxMon(struct BoxPokemon *mon, u16 method, u32 arg
return species != targetSpecies ? targetSpecies : SPECIES_NONE; return species != targetSpecies ? targetSpecies : SPECIES_NONE;
} }
u16 MonTryLearningNewMoveEvolution(struct Pokemon *mon, bool8 firstMove)
{
u16 species = GetMonData(mon, MON_DATA_SPECIES, NULL);
u8 level = GetMonData(mon, MON_DATA_LEVEL, NULL);
// Since you can learn more than one move per level,
// the game needs to know whether you decided to
// learn it or keep the old set to avoid asking
// you to learn the same move over and over again.
if (firstMove)
{
sLearningMoveTableID = 0;
}
while(gLevelUpLearnsets[species][sLearningMoveTableID].move != LEVEL_UP_END)
{
while (gLevelUpLearnsets[species][sLearningMoveTableID].level == 0 || gLevelUpLearnsets[species][sLearningMoveTableID].level == level)
{
gMoveToLearn = gLevelUpLearnsets[species][sLearningMoveTableID].move;
sLearningMoveTableID++;
return GiveMoveToMon(mon, gMoveToLearn);
}
sLearningMoveTableID++;
}
return 0;
}