Merge branch 'master' into doc-inc2

This commit is contained in:
GriffinR authored and GitHub committed 2019-10-13 15:44:07 -04:00
commit 30ef494163
174 files changed
+7756 -8370

No files matched your search

@@ -810,7 +810,7 @@ LilycoveCity_ContestLobby_EventScript_21AAE1:: @ 821AAE1
LilycoveCity_ContestLobby_EventScript_21AAEF:: @ 821AAEF
special CloseLink
msgbox LilycoveCity_ContestLobby_Text_27821C, MSGBOX_DEFAULT
msgbox Text_LinkErrorPleaseReset, MSGBOX_DEFAULT
release
end
@@ -908,12 +908,12 @@ LilycoveCity_ContestLobby_EventScript_21AC0B:: @ 821AC0B
end
LilycoveCity_ContestLobby_EventScript_21AC33:: @ 821AC33
special BerryBlenderLinkBecomeLeader
special TryBecomeLinkLeader
waitstate
return
LilycoveCity_ContestLobby_EventScript_21AC38:: @ 821AC38
special BerryBlenderLinkJoinGroup
special TryJoinLinkGroup
waitstate
return