Merge branch 'master' into fix-eventobj

This commit is contained in:
GriffinR
2019-12-18 13:16:38 -05:00
committed by GitHub
82 changed files with 3472 additions and 6562 deletions

View File

@@ -39,7 +39,7 @@ BerryTree_EventScript_WantToPlant:: @ 8274374
end
BerryTree_EventScript_ChooseBerryToPlant:: @ 8274393
fadescreen 1
fadescreen FADE_TO_BLACK
closemessage
special Bag_ChooseBerry
waitstate