From 5070d5b6056dba7632650963b131c15de97cca64 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Fri, 10 Jun 2022 08:00:45 -0300 Subject: [PATCH 1/2] Syntax fixes for Toxel's evo methods --- src/pokemon.c | 56 +++++++++++++++++++++++++-------------------------- 1 file changed, 27 insertions(+), 29 deletions(-) diff --git a/src/pokemon.c b/src/pokemon.c index 85bb048312..2010abf9ab 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -6669,21 +6669,20 @@ u16 GetEvolutionTargetSpecies(struct Pokemon *mon, u8 mode, u16 evolutionItem, s u8 nature = GetNature(mon); switch (nature) { - case NATURE_HARDY: - case NATURE_BRAVE: - case NATURE_ADAMANT: - case NATURE_NAUGHTY: - case NATURE_DOCILE: - case NATURE_IMPISH: - case NATURE_LAX: - case NATURE_HASTY: - case NATURE_JOLLY: - case NATURE_NAIVE: - case NATURE_RASH: - case NATURE_SASSY: - case NATURE_QUIRKY: - targetSpecies = gEvolutionTable[species][i].targetSpecies; - break; + case NATURE_HARDY: + case NATURE_BRAVE: + case NATURE_ADAMANT: + case NATURE_NAUGHTY: + case NATURE_DOCILE: + case NATURE_IMPISH: + case NATURE_LAX: + case NATURE_HASTY: + case NATURE_JOLLY: + case NATURE_NAIVE: + case NATURE_RASH: + case NATURE_SASSY: + case NATURE_QUIRKY: + targetSpecies = gEvolutionTable[species][i].targetSpecies; } } break; @@ -6693,20 +6692,19 @@ u16 GetEvolutionTargetSpecies(struct Pokemon *mon, u8 mode, u16 evolutionItem, s u8 nature = GetNature(mon); switch (nature) { - case NATURE_LONELY: - case NATURE_BOLD: - case NATURE_RELAXED: - case NATURE_TIMID: - case NATURE_SERIOUS: - case NATURE_MODEST: - case NATURE_MILD: - case NATURE_QUIET: - case NATURE_BASHFUL: - case NATURE_CALM: - case NATURE_GENTLE: - case NATURE_CAREFUL: - targetSpecies = gEvolutionTable[species][i].targetSpecies; - break; + case NATURE_LONELY: + case NATURE_BOLD: + case NATURE_RELAXED: + case NATURE_TIMID: + case NATURE_SERIOUS: + case NATURE_MODEST: + case NATURE_MILD: + case NATURE_QUIET: + case NATURE_BASHFUL: + case NATURE_CALM: + case NATURE_GENTLE: + case NATURE_CAREFUL: + targetSpecies = gEvolutionTable[species][i].targetSpecies; } } break; From e2cc269b437eebd618655388a32462dbbd814363 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Fri, 1 Jul 2022 16:19:35 -0300 Subject: [PATCH 2/2] Updated syntax --- src/pokemon.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/pokemon.c b/src/pokemon.c index 2010abf9ab..215dc00626 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -6683,6 +6683,7 @@ u16 GetEvolutionTargetSpecies(struct Pokemon *mon, u8 mode, u16 evolutionItem, s case NATURE_SASSY: case NATURE_QUIRKY: targetSpecies = gEvolutionTable[species][i].targetSpecies; + break; } } break; @@ -6705,6 +6706,7 @@ u16 GetEvolutionTargetSpecies(struct Pokemon *mon, u8 mode, u16 evolutionItem, s case NATURE_GENTLE: case NATURE_CAREFUL: targetSpecies = gEvolutionTable[species][i].targetSpecies; + break; } } break;