Skip to content

Commit

Permalink
Fixes Stantler's evolution's boolean (#3548)
Browse files Browse the repository at this point in the history
* Stantler's evolution now has the proper gen boolean

* Fixed comment for new evo methods
  • Loading branch information
fdeblasio authored Nov 9, 2023
1 parent 3381507 commit b5b6797
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions include/constants/pokemon.h
Original file line number Diff line number Diff line change
Expand Up @@ -289,9 +289,9 @@
#define EVO_ITEM_HOLD 41 // Pokémon levels up, holds specified item
#define EVO_LEVEL_FOG 42 // Pokémon reaches the specified level during fog in the overworld
#define EVO_MOVE_TWO_SEGMENT 43 // Pokémon levels up, knows specified move, has a personality value with a modulus of 0
#define EVO_MOVE_THREE_SEGMENT 44 // Pokémon levels up, knows specified move, has a personality value with a modulus of 1-9
#define EVO_MOVE_THREE_SEGMENT 44 // Pokémon levels up, knows specified move, has a personality value with a modulus of 1-99
#define EVO_LEVEL_FAMILY_OF_THREE 45 // Pokémon reaches the specified level with a personality value with a modulus of 0
#define EVO_LEVEL_FAMILY_OF_FOUR 46 // Pokémon reaches the specified level with a personality value with a modulus of 1-9
#define EVO_LEVEL_FAMILY_OF_FOUR 46 // Pokémon reaches the specified level with a personality value with a modulus of 1-99

#define EVOS_PER_MON 11

Expand Down
2 changes: 1 addition & 1 deletion src/data/pokemon/evolution.h
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] =
[SPECIES_PORYGON2] = {{EVO_TRADE_ITEM, ITEM_DUBIOUS_DISC, SPECIES_PORYGON_Z},
{EVO_ITEM, ITEM_DUBIOUS_DISC, SPECIES_PORYGON_Z}},
#endif
#if P_GEN_9_POKEMON == TRUE
#if P_GEN_8_POKEMON == TRUE
[SPECIES_STANTLER] = {{EVO_MOVE, MOVE_PSYSHIELD_BASH, SPECIES_WYRDEER}},
#endif
[SPECIES_TYROGUE] = {{EVO_LEVEL_ATK_LT_DEF, 20, SPECIES_HITMONCHAN},
Expand Down

0 comments on commit b5b6797

Please sign in to comment.