Merge branch 'master' into link

This commit is contained in:
PikalaxALT committed 2017-11-19 00:07:56 -05:00
commit d6d315d817
59 files changed
+4682 -7627

No files matched your search

+1 -1
View File
@@ -7,7 +7,7 @@ Route117_MapScript1_1F3983: @ 81F3983
end
Route117_EventScript_1F3989:: @ 81F3989
checkflag FLAG_0x086
checkflag FLAG_PENDING_DAYCARE_EGG
goto_if 0, Route117_EventScript_1F3999
setobjectxyperm 3, 47, 6