From 16283b47c799c0968fbd21afbf0542b338c98286 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada D'Ottone Date: Sat, 16 Apr 2022 15:57:38 -0400 Subject: [PATCH] Fixed compile. I had these changes in a testing branch but forgot to add them back here. --- src/pokemon.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/pokemon.c b/src/pokemon.c index 5af93106a..f136fb03a 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -3294,6 +3294,7 @@ void CreateBoxMon(struct BoxPokemon *boxMon, u16 species, u8 level, u8 fixedIV, #if P_LEGENDARY_PERFECT_IVS >= GEN_6 if (gBaseStats[species].flags & (FLAG_LEGENDARY | FLAG_MYTHICAL | FLAG_ULTRA_BEAST)) { + iv = MAX_PER_STAT_IVS; // Initialize a list of IV indices. for (i = 0; i < NUM_STATS; i++) { @@ -3312,24 +3313,22 @@ void CreateBoxMon(struct BoxPokemon *boxMon, u16 species, u8 level, u8 fixedIV, switch (selectedIvs[i]) { case STAT_HP: - SetBoxMonData(boxMon, MON_DATA_HP_IV, MAX_PER_STAT_IVS); - //iv = GetBoxMonData(&daycare->mons[whichParents[i]].mon, MON_DATA_HP_IV); - //SetMonData(egg, MON_DATA_HP_IV, &iv); + SetBoxMonData(boxMon, MON_DATA_HP_IV, &iv); break; case STAT_ATK: - SetBoxMonData(boxMon, MON_DATA_ATK_IV, MAX_PER_STAT_IVS); + SetBoxMonData(boxMon, MON_DATA_ATK_IV, &iv); break; case STAT_DEF: - SetBoxMonData(boxMon, MON_DATA_DEF_IV, MAX_PER_STAT_IVS); + SetBoxMonData(boxMon, MON_DATA_DEF_IV, &iv); break; case STAT_SPEED: - SetBoxMonData(boxMon, MON_DATA_SPEED_IV, MAX_PER_STAT_IVS); + SetBoxMonData(boxMon, MON_DATA_SPEED_IV, &iv); break; case STAT_SPATK: - SetBoxMonData(boxMon, MON_DATA_SPATK_IV, MAX_PER_STAT_IVS); + SetBoxMonData(boxMon, MON_DATA_SPATK_IV, &iv); break; case STAT_SPDEF: - SetBoxMonData(boxMon, MON_DATA_SPDEF_IV, MAX_PER_STAT_IVS); + SetBoxMonData(boxMon, MON_DATA_SPDEF_IV, &iv); break; } }