Merge branch 'master' into fix-eventobj

This commit is contained in:
GriffinR authored and GitHub committed 2019-12-18 13:16:38 -05:00
commit 949509aade
82 files changed
+3472 -6562

No files matched your search

+1 -1
View File
@@ -220,7 +220,7 @@ Route101_EventScript_BirchsBag:: @ 81EBE16
faceplayer
setflag FLAG_SYS_POKEMON_GET
setflag FLAG_RESCUED_BIRCH
fadescreen 1
fadescreen FADE_TO_BLACK
removeobject 4
setobjectxy OBJ_EVENT_ID_PLAYER, 6, 13
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft