Merge branch 'master' into Unbound

This commit is contained in:
Skeli
2020-07-21 13:43:07 +03:00
parent 896ff04c57
commit 1dbc1f5ad0
29 changed files with 18222 additions and 369 deletions

View File

@@ -43,6 +43,10 @@ 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_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
EVO_DAMAGE_LOCATION // recieve 49+ damage in battle without fainting, walk to specific tile
};
#define EVO_GIGANTAMAX 0xFD
@@ -60,4 +64,4 @@ enum MegaEvoVariants
#define MAPSEC_ROUTE_8 0x6C
#define MAPSEC_BLIZZARD_CITY 0x5C
#define MAPSEC_FROZEN_FOREST 0x99
#define MAPSEC_THUNDERCAP_MOUNTAIN 0x8A
#define MAPSEC_THUNDERCAP_MOUNTAIN 0x8A