Merge remote-tracking branch 'RHH/pokemon_expansion' into RHH_masterMerge

# Conflicts:
#	asm/macros/event.inc
#	data/specials.inc
#	include/constants/species.h
#	src/data/pokemon/base_stats.h

asm/macros/event.inc

@@ -2006,3 +2006,15 @@
 	.macro totemboost_evas2 battler:req
 	settotemboost \battler, 0, 0, 0, 0, 0, 0, 2
 	.endm
+
+	@ Attempts to trigger a special evolution method in the overworld.
+	@ There may be other conditions required which are coded for in GetEvolutionTargetSpecies.
+	@ EX: tryspecialevo EVO_WATER_SCROLL, FALSE, FALSE triggers Kubfu's EVO_WATER_SCROLL evolution
+	@ 	  method, cannot be cancelled in the evolution scene, and will only evolve one Kubfu if there
+	@	  are multiple in the player's party.
+	.macro tryspecialevo evoMethod:req, canStopEvo=TRUE, tryMultiple=TRUE
+	setvar VAR_0x8000, \evoMethod
+	setvar VAR_0x8001, \canStopEvo
+	setvar VAR_0x8002, \tryMultiple
+	special TrySpecialOverworldEvo
+	.endm