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:
commit
231727d02b
36 files changed
+794
-150
No files matched your search
@@ -536,3 +536,4 @@ gSpecials::
|
||||
def_special CloseDeptStoreElevatorWindow
|
||||
def_special TrySetBattleTowerLinkType
|
||||
def_special SetTotemBoost
|
||||
def_special TrySpecialOverworldEvo
|
||||
Reference in new issue
Block a user