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
This commit is contained in:
Eduardo Quezada committed 2022-07-22 23:33:04 -04:00
commit 231727d02b
36 files changed
+794 -150

No files matched your search

+1
View File
@@ -536,3 +536,4 @@ gSpecials::
def_special CloseDeptStoreElevatorWindow
def_special TrySetBattleTowerLinkType
def_special SetTotemBoost
def_special TrySpecialOverworldEvo