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 #2167 from LOuroboros/ampedSyntax

Browse Source 
Syntax fixes for Toxel's evo methods
This commit is contained in:
ghoulslash 2022-07-01 15:29:06 -04:00 committed by GitHub
commit ade935f6cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/pokemon.c
View File

@ -6669,21 +6669,21 @@ u16 GetEvolutionTargetSpecies(struct Pokemon *mon, u8 mode, u16 evolutionItem, s
u8 nature = GetNature(mon); u8 nature = GetNature(mon);
switch (nature) switch (nature)
{ {
case NATURE_HARDY: case NATURE_HARDY:
case NATURE_BRAVE: case NATURE_BRAVE:
case NATURE_ADAMANT: case NATURE_ADAMANT:
case NATURE_NAUGHTY: case NATURE_NAUGHTY:
case NATURE_DOCILE: case NATURE_DOCILE:
case NATURE_IMPISH: case NATURE_IMPISH:
case NATURE_LAX: case NATURE_LAX:
case NATURE_HASTY: case NATURE_HASTY:
case NATURE_JOLLY: case NATURE_JOLLY:
case NATURE_NAIVE: case NATURE_NAIVE:
case NATURE_RASH: case NATURE_RASH:
case NATURE_SASSY: case NATURE_SASSY:
case NATURE_QUIRKY: case NATURE_QUIRKY:
targetSpecies = gEvolutionTable[species][i].targetSpecies; targetSpecies = gEvolutionTable[species][i].targetSpecies;
break; break;
} }
} }
break; break;
@ -6693,20 +6693,20 @@ u16 GetEvolutionTargetSpecies(struct Pokemon *mon, u8 mode, u16 evolutionItem, s
u8 nature = GetNature(mon); u8 nature = GetNature(mon);
switch (nature) switch (nature)
{ {
case NATURE_LONELY: case NATURE_LONELY:
case NATURE_BOLD: case NATURE_BOLD:
case NATURE_RELAXED: case NATURE_RELAXED:
case NATURE_TIMID: case NATURE_TIMID:
case NATURE_SERIOUS: case NATURE_SERIOUS:
case NATURE_MODEST: case NATURE_MODEST:
case NATURE_MILD: case NATURE_MILD:
case NATURE_QUIET: case NATURE_QUIET:
case NATURE_BASHFUL: case NATURE_BASHFUL:
case NATURE_CALM: case NATURE_CALM:
case NATURE_GENTLE: case NATURE_GENTLE:
case NATURE_CAREFUL: case NATURE_CAREFUL:
targetSpecies = gEvolutionTable[species][i].targetSpecies; targetSpecies = gEvolutionTable[species][i].targetSpecies;
break; break;
} }
} }
break; break;