Merge branch 'master' into pokemon

This commit is contained in:
jiangzhengwenjz
2019-07-16 23:22:52 +08:00
26 changed files with 750 additions and 1524 deletions
+1 -1
View File
@@ -205,7 +205,7 @@ gSpecials:: @ 815FD60
def_special ScriptHatchMon
def_special EggHatch
def_special sub_8046EAC
def_special sub_80CD228
def_special Special_BattleRecords
def_special IsEnoughForCostInVar0x8005
def_special SubtractMoneyFromVar0x8005
def_special ExecuteWhiteOut