Merge with Master

This commit is contained in:
Skeli
2021-10-14 17:28:08 -04:00
22 changed files with 459 additions and 83 deletions

View File

@@ -47,7 +47,8 @@ enum EvolutionMethods
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
EVO_DAMAGE_LOCATION, // recieve 49+ damage in battle without fainting, walk to specific tile
EVO_ITEM_LOCATION, // Stand on a tile with a certain behaviour and use an item on a Pokemon
};
#define EVO_GIGANTAMAX 0xFD
@@ -61,6 +62,8 @@ enum MegaEvoVariants
MEGA_VARIANT_ULTRA_BURST, //Necrozma
};
#define MB_SHALLOW_WATER 0x17 //For Alolan Raichu
#define MAPSEC_FROST_MOUNTAIN 0x82
#define MAPSEC_ROUTE_8 0x6C
#define MAPSEC_BLIZZARD_CITY 0x5C