Merge branch 'master' into Unbound

This commit is contained in:
Skeli
2021-07-04 16:06:31 -04:00
240 changed files with 3321 additions and 225 deletions

View File

@@ -43,6 +43,7 @@ enum EvolutionMethods
EVO_MOVE, // knows a given move
EVO_OTHER_PARTY_MON, //another poke in the party, arg is a specific species
EVO_LEVEL_SPECIFIC_TIME_RANGE, // above given level with a range (unknown is [start][end]. eg lycanroc -> 1700-1800 hrs -> 0x1112)
EVO_FLAG_SET, //If a certain flag is set. Can be used for touching the Mossy/Icy Rock for Leafeon/Glaceon evolutions
EVO_CRITICAL_HIT, // successfully land 3 critical hits in one battle
EVO_NATURE_HIGH, // evolution based on high key nature at a certain level
EVO_NATURE_LOW, // evolution based on low key nature at a certain level